fix math fonts with LyX/Mac

[lyx.git] / src / frontends / Painter.C

diff --git a/src/frontends/Painter.C b/src/frontends/Painter.C
index af127d5b3dd7040a9e2dd7accb0c63bfa53b914d..323cc0e715f7a7a3a8426a240df1eb6c4701e5e3 100644 (file)
--- a/src/frontends/Painter.C
+++ b/src/frontends/Painter.C
@@ -1,44 +1,45 @@
 /**
  * \file Painter.C
- * Copyright 1998-2002 the LyX Team
- * 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 <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * 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;
- 
-Painter & Painter::button(int x, int y, int w, int h)
+using std::string;
+
+
+void Painter::button(int x, int y, int w, int h)
 {
        fillRectangle(x, y, w, h, LColor::buttonbg);
        buttonFrame(x, y, w, h);
-       return * this;
 }
 
 
-Painter & Painter::buttonFrame(int x, int y, int w, int h)
+void Painter::buttonFrame(int x, int y, int w, int h)
 {
        //  Width of a side of the button
        int const d = 2;
 
        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;
@@ -50,33 +51,36 @@ Painter & Painter::buttonFrame(int x, int y, int w, int h)
        x1[2] = x + w; y1[2] = (y + h - d);
        x1[3] = x + w; y1[3] = y;
        fillPolygon(x1, y1, 4, LColor::right);
-
-       return *this;
 }
 
 
-Painter & Painter::rectText(int x, int baseline, 
-       string const & str, 
+void 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);
- 
-       rectangle(x, baseline - ascent, width, ascent + descent, frame);
-       fillRectangle(x + 1, baseline - ascent + 1, width - 1, 
-                     ascent + descent - 1, back);
+
+       if (back != LColor::none) {
+               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, 
+void Painter::buttonText(int x, int baseline,
+       string const & str,
        LyXFont const & font)
 {
        int width;
@@ -84,10 +88,9 @@ 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;
 }
 
 
@@ -95,7 +98,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 {