X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainterBase.C;h=892815d7135160d1c28082d8d7586d98cea03e4b;hb=98c966c64594611e469313314abd1e59524adb4a;hp=f29ef37a2b411218712f69fd0bf4e39e4786158e;hpb=94c00c08a86bbe839d0d9f357a345c1f8250eafb;p=lyx.git

diff --git a/src/PainterBase.C b/src/PainterBase.C
index f29ef37a2b..892815d713 100644
--- a/src/PainterBase.C
+++ b/src/PainterBase.C
@@ -1,8 +1,8 @@
 /* This file is part of
  * ======================================================
- * 
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *	    Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
@@ -18,9 +18,6 @@
 #include "WorkArea.h"
 #include "font.h"
 
-int PainterBase::dummy1 = 0;
-int PainterBase::dummy2 = 0;
-int PainterBase::dummy3 = 0;
 
 int PainterBase::paperMargin() const
 {
@@ -70,77 +67,28 @@ PainterBase & PainterBase::buttonFrame(int x, int y, int w, int h)
 
 	fillRectangle(x, y, w, d, LColor::top);
 	fillRectangle(x, (y+h-d), w, d, LColor::bottom);
- 
+
 	// Now a couple of trapezoids
 	int x1[4], y1[4];
- 
-	x1[0] = x+d;   y1[0] = y+d;
-	x1[1] = x+d;   y1[1] = (y+h-d);
-	x1[2] = x;     y1[2] = y+h;
+
+	x1[0] = x + d;   y1[0] = y + d;
+	x1[1] = x + d;   y1[1] = (y + h - d);
+	x1[2] = x;     y1[2] = y + h;
 	x1[3] = x;     y1[3] = y;
 	fillPolygon(x1, y1, 4, LColor::left);
 
-	x1[0] = (x+w-d); y1[0] = y+d;
-	x1[1] = (x+w-d); y1[1] = (y+h-d);
-	x1[2] = x+w; y1[2] = (y+h-d);
-	x1[3] = x+w; y1[3] = y;
+	x1[0] = (x + w - d); y1[0] = y + d;
+	x1[1] = (x + w - d); y1[1] = (y + h - d);
+	x1[2] = x + w; y1[2] = (y + h - d);
+	x1[3] = x + w; y1[3] = y;
 	fillPolygon(x1, y1, 4, LColor::right);
 
 	return *this;
 }
 
 
-#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, 
+PainterBase & PainterBase::rectText(int x, int baseline,
+				    string const & str,
 				    LyXFont const & font,
 				    LColor::color back,
 				    LColor::color frame)
@@ -148,27 +96,26 @@ PainterBase & PainterBase::rectText(int x, int baseline,
 	int width;
 	int ascent;
 	int descent;
-	
+
 	lyxfont::rectText(str, font, width, ascent, descent);
 	rectangle(x, baseline - ascent, width, ascent + descent, frame);
-	fillRectangle(x + 1, baseline - ascent + 1, width - 1, 
+	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;
 }
 
 
 PainterBase & PainterBase::buttonText(int x, int baseline,
-				      string const & str, 
+				      string const & str,
 				      LyXFont const & font)
 {
 	int width;
 	int ascent;
 	int descent;
-	
+
 	lyxfont::buttonText(str, font, width, ascent, descent);
 	button(x, baseline - ascent, width, descent + ascent);
 	text(x + 4, baseline, str, font);
 	return *this;
 }
-#endif