FILMagain changes (will need some work)

[lyx.git] / src / PainterBase.C

diff --git a/src/PainterBase.C b/src/PainterBase.C
index f499e0be4d62ccc7985c787ded00d1d9de1f7a6e..e92125ac4e5d493a77731d565b733b784c9d14e5 100644 (file)
--- a/src/PainterBase.C
+++ b/src/PainterBase.C
@@ -16,7 +16,7 @@
 #include "PainterBase.h"
 #include "lyxfont.h"
 #include "WorkArea.h"
-
+#include "font.h"
 
 int PainterBase::dummy1 = 0;
 int PainterBase::dummy2 = 0;
@@ -34,21 +34,9 @@ int PainterBase::paperWidth() const
 }
 
 
-int PainterBase::width(string const & s, LyXFont const & f) const
-{
-       return f.stringWidth(s);
-}
-
-
-int PainterBase::width(char const * s, int l, LyXFont const & f) const
-{
-       return f.textWidth(s, l);
-}
-
-
-int PainterBase::width(char c, LyXFont const & f) const
+int PainterBase::paperHeight() const
 {
-       return f.width(c);
+       return owner.height();
 }
 
 
@@ -110,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;
 
@@ -129,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;