X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainterBase.C;h=1c5e21473f9858e1a745a77a8c8ba5ceedb4cff3;hb=5bca2431091765b1552cbb5410b1f2c18bbcb9c1;hp=f29ef37a2b411218712f69fd0bf4e39e4786158e;hpb=94c00c08a86bbe839d0d9f357a345c1f8250eafb;p=lyx.git

diff --git a/src/PainterBase.C b/src/PainterBase.C
index f29ef37a2b..1c5e21473f 100644
--- a/src/PainterBase.C
+++ b/src/PainterBase.C
@@ -90,55 +90,6 @@ PainterBase & PainterBase::buttonFrame(int x, int y, int w, int h)
 }
 
 
-#if 0
-PainterBase & PainterBase::rectText(int x, int baseline, 
-				    string const & str, 
-				    LyXFont const & font,
-				    LColor::color back,
-				    LColor::color frame, bool draw,
-				    int & width, int & ascent, int & descent)
-{
-#if 0
-	static int const d = 2;
-	width = lyxfont::width(str, font) + d * 2 + 2;
-	ascent = lyxfont::maxAscent(font) + d;
-	descent = lyxfont::maxDescent(font) + d;
-#else
-	lyxfont::rectText(str, font, width, axcent, descent);
-#endif
-	if (!draw) return *this;
-
-	rectangle(x, baseline - ascent, width, ascent + descent, frame);
-	fillRectangle(x + 1, baseline - ascent + 1, width - 1, 
-		      ascent + descent - 1, back);
-#if 0
-	text(x + d, baseline, str, font);
-#else
-	text(x + 2, baseline, str, font);
-#endif
-	return *this;
-}
-
-
-PainterBase & PainterBase::buttonText(int x, int baseline,
-				      string const & str, 
-				      LyXFont const & font, bool draw,
-				      int & width, int & ascent, int & descent)
-{
-#if 0
-	width = lyxfont::width(str, font) + 8;
-	ascent = lyxfont::maxAscent(font) + 3;
-	descent = lyxfont::maxDescent(font) + 3;
-#else
-	lyxfont::buttonText(str, font, width, ascent, descent);
-#endif
-	if (!draw) return *this;
-
-	button(x, baseline - ascent, width, descent + ascent);
-	text(x + 4, baseline, str, font);
-	return *this;
-}
-#else
 PainterBase & PainterBase::rectText(int x, int baseline, 
 				    string const & str, 
 				    LyXFont const & font,
@@ -153,7 +104,7 @@ PainterBase & PainterBase::rectText(int x, int baseline,
 	rectangle(x, baseline - ascent, width, ascent + descent, frame);
 	fillRectangle(x + 1, baseline - ascent + 1, width - 1, 
 		      ascent + descent - 1, back);
-	text(x + 2, baseline, str, font);
+	text(x + 3, baseline, str, font);
 	return *this;
 }
 
@@ -171,4 +122,3 @@ PainterBase & PainterBase::buttonText(int x, int baseline,
 	text(x + 4, baseline, str, font);
 	return *this;
 }
-#endif