X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainterBase.h;h=e3b7d0747287ebb4956c4ef6cf34500234060ef7;hb=cb52251ccff29d6cbfa13ab90a96be566e3f41ac;hp=71a39f987f400533ace30993521019903ebdc510;hpb=94c00c08a86bbe839d0d9f357a345c1f8250eafb;p=lyx.git

diff --git a/src/PainterBase.h b/src/PainterBase.h
index 71a39f987f..e3b7d07472 100644
--- a/src/PainterBase.h
+++ b/src/PainterBase.h
@@ -137,7 +137,7 @@ public:
 	/// Fill a rectangle
 	virtual PainterBase & fillRectangle(
 		int x, int y, int w, int h,
-		LColor::color = LColor::background) = 0;
+		LColor::color) = 0;
 	
 	/// A filled rectangle with the shape of a 3D button
 	virtual PainterBase & button(int x, int y, int w, int h);
@@ -162,43 +162,16 @@ public:
 	/// Draw a char at position x, y (y is the baseline)
 	virtual PainterBase & text(int x, int y, char c, LyXFont const & f)=0;
 
-#if 0
-	/** Draws a string and encloses it inside a rectangle. Returns
-	    the size of the rectangle. If draw is false, we only calculate
-	    the size. */
-	virtual PainterBase & rectText(int x, int baseline, 
-			   string const & string, 
-			   LyXFont const & font,
-			   LColor::color back,
-			   LColor::color frame, bool draw = true,
-			   int & width = PainterBase::dummy1,
-			   int & ascent = PainterBase::dummy2, 
-			   int & descent = PainterBase::dummy3);
-
-	/** Draw a string and encloses it inside a button frame. Returns
-	    the size of the frame. If draw is false, we only calculate
-	    the size. */
-	virtual PainterBase & buttonText(int x, int baseline, string const & s,
-			     LyXFont const & font, bool draw = true,
-			     int & width = PainterBase::dummy1,
-			     int & ascent = PainterBase::dummy2, 
-			     int & descent = PainterBase::dummy3);
-#else
-	/** Draws a string and encloses it inside a rectangle. Returns
-	    the size of the rectangle. If draw is false, we only calculate
-	    the size. */
+	/** Draws a string and encloses it inside a rectangle. */
 	PainterBase & rectText(int x, int baseline, 
-			   string const & string, 
-			   LyXFont const & font,
-			   LColor::color back,
+			       string const & string, 
+			       LyXFont const & font,
+			       LColor::color back,
 			       LColor::color frame);
 
-	/** Draw a string and encloses it inside a button frame. Returns
-	    the size of the frame. If draw is false, we only calculate
-	    the size. */
+	/** Draw a string and encloses it inside a button frame. */
 	PainterBase & buttonText(int x, int baseline, string const & s,
 				 LyXFont const & font);
-#endif
 protected:
 	///
 	WorkArea & owner;