FILMagain changes (will need some work)

[lyx.git] / src / PainterBase.C

diff --git a/src/PainterBase.C b/src/PainterBase.C
index efc760c4ed330118d6de342472251afdbe63f888..e92125ac4e5d493a77731d565b733b784c9d14e5 100644 (file)
--- a/src/PainterBase.C
+++ b/src/PainterBase.C
@@ -9,8 +9,6 @@
 
 #include <config.h>
 
-#ifdef USE_PAINTER
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
@@ -18,39 +16,27 @@
 #include "PainterBase.h"
 #include "lyxfont.h"
 #include "WorkArea.h"
-
+#include "font.h"
 
 int PainterBase::dummy1 = 0;
 int PainterBase::dummy2 = 0;
 int PainterBase::dummy3 = 0;
 
-int PainterBase::paperMargin()
+int PainterBase::paperMargin() const
 {
        return 20;
 }
 
 
-int PainterBase::paperWidth()
+int PainterBase::paperWidth() const
 {
        return owner.workWidth();
 }
 
 
-int PainterBase::width(string const & s, LyXFont const & f)
-{
-       return f.stringWidth(s);
-}
-
-
-int PainterBase::width(char const * s, int l, LyXFont const & f)
+int PainterBase::paperHeight() const
 {
-       return f.textWidth(s, l);
-}
-
-
-int PainterBase::width(char c, LyXFont const & f)
-{
-       return f.width(c);
+       return owner.height();
 }
 
 
@@ -112,9 +98,9 @@ PainterBase & PainterBase::rectText(int x, int baseline,
                                    int & width, int & ascent, int & descent)
 {
        static int const d = 2;
-       width = this->width(str, font) + d * 2 + 2;
-       ascent = font.maxAscent() + d;
-       descent = font.maxDescent() + d;
+       width = lyxfont::width(str, font) + d * 2 + 2;
+       ascent = lyxfont::maxAscent(font) + d;
+       descent = lyxfont::maxDescent(font) + d;
 
        if (!draw) return *this;
 
@@ -131,9 +117,9 @@ PainterBase & PainterBase::buttonText(int x, int baseline,
                                      LyXFont const & font, bool draw,
                                      int & width, int & ascent, int & descent)
 {
-       width = this->width(str, font) + 8;
-       ascent = font.maxAscent() + 3;
-       descent = font.maxDescent() + 3;
+       width = lyxfont::width(str, font) + 8;
+       ascent = lyxfont::maxAscent(font) + 3;
+       descent = lyxfont::maxDescent(font) + 3;
 
        if (!draw) return *this;
 
@@ -141,5 +127,3 @@ PainterBase & PainterBase::buttonText(int x, int baseline,
        text(x + 4, baseline, str, font);
        return *this;
 }
-
-#endif