X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.C;h=74fe2b78f0818ace169cfe027c5fb47db20e827d;hb=2f1d525ee1d41bc20adbfe766a9c5d90469aa4b2;hp=06544896d8161e2d1ee89f57fdc8e1386c556aec;hpb=6fac1dc98003a6a6e02765f078b3d3426d426508;p=lyx.git

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index 06544896d8..74fe2b78f0 100644
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -1,26 +1,27 @@
 /**
  * \file Painter.C
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author John Levon 
+ * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "Painter.h"
-#include "lyxfont.h"
+#include "font_metrics.h"
 #include "WorkArea.h"
-#include "frontends/font_metrics.h"
- 
+
+#include "LColor.h"
+#include "lyxfont.h"
+
 using std::max;
- 
+using std::string;
+
+
 Painter & Painter::button(int x, int y, int w, int h)
 {
 	fillRectangle(x, y, w, h, LColor::buttonbg);
@@ -36,10 +37,10 @@ Painter & Painter::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;
@@ -56,34 +57,34 @@ Painter & Painter::buttonFrame(int x, int y, int w, int h)
 }
 
 
-Painter & Painter::rectText(int x, int baseline, 
-	string const & str, 
+Painter & Painter::rectText(int x, int baseline,
+	string const & str,
 	LyXFont const & font,
-	LColor::color back,
-	LColor::color frame)
+	LColor_color back,
+	LColor_color frame)
 {
 	int width;
 	int ascent;
 	int descent;
 
 	font_metrics::rectText(str, font, width, ascent, descent);
- 
-	if (frame != LColor::none) {
-		rectangle(x, baseline - ascent, width, ascent + descent, frame);
-	}
- 
+
 	if (back != LColor::none) {
-		fillRectangle(x + 1, baseline - ascent + 1, width - 1, 
+		fillRectangle(x + 1, baseline - ascent + 1, width - 1,
 			      ascent + descent - 1, back);
 	}
- 
+
+	if (frame != LColor::none) {
+		rectangle(x, baseline - ascent, width, ascent + descent, frame);
+	}
+
 	text(x + 3, baseline, str, font);
 	return *this;
 }
 
 
 Painter & Painter::buttonText(int x, int baseline,
-	string const & str, 
+	string const & str,
 	LyXFont const & font)
 {
 	int width;
@@ -91,7 +92,7 @@ Painter & Painter::buttonText(int x, int baseline,
 	int descent;
 
 	font_metrics::buttonText(str, font, width, ascent, descent);
- 
+
 	button(x, baseline - ascent, width, descent + ascent);
 	text(x + 4, baseline, str, font);
 	return *this;
@@ -102,7 +103,7 @@ void Painter::underline(LyXFont const & f, int x, int y, int width)
 {
 	int const below = max(font_metrics::maxDescent(f) / 2, 2);
 	int const height = max((font_metrics::maxDescent(f) / 4) - 1, 1);
- 
+
 	if (height < 2) {
 		line(x, y + below, x + width, y + below, f.color());
 	} else {