get builddir!=srcdir compiling working; allow successful make even without noweb...

[lyx.git] / src / PainterBase.h

diff --git a/src/PainterBase.h b/src/PainterBase.h
index b6a47568f9349ad8710fd248f34f701fb90060ea..47fa8c89939a805e7571d2f92711f9c776fe4a1b 100644 (file)
--- a/src/PainterBase.h
+++ b/src/PainterBase.h
@@ -35,7 +35,11 @@ class LyXFont;
 class PainterBase {
 protected:
         ///
-       static int dummy1, dummy2, dummy3;
+       static int dummy1;
+       ///
+       static int dummy2;
+       ///
+       static int dummy3;
 public:
        ///
        enum line_width {
@@ -61,13 +65,14 @@ public:
        ///
        virtual ~PainterBase() {}
 
-       /** Screen geometry */
+       /* Screen geometry */
        ///
        int paperMargin() const;
        ///
        int paperWidth() const;
+       ///
+       int paperHeight() const;
        
-       /**@Basic drawing routines */
        /// Draw a line from point to point
        virtual PainterBase & line(
                int x1, int y1, int x2, int y2, 
@@ -139,23 +144,20 @@ public:
        /// 
         virtual PainterBase & buttonFrame(int x, int y, int w, int h);
        
-       /**@Image stuff */
        
-       /// For the figure inset
+       // For the figure inset
        // This can't be part of the base since we don't know what window
        // system we will be useing, or if are going to use pixmaps at all.
        //virtual PainterBase & pixmap(int x, int y, Pixmap bitmap)=0;
 
        
-       /**@String functions */
-       
        /// Draw a string at position x, y (y is the baseline)
        virtual PainterBase & text(int x, int y,
-                                  string const &str, LyXFont const & f) = 0;
+                                  string const & str, LyXFont const & f) = 0;
 
        /** Draw a string at position x, y (y is the baseline)
            This is just for fast drawing */
-       virtual PainterBase & text(int x, int y, char const * str, int l,
+       virtual PainterBase & text(int x, int y, char const * str, size_t l,
                       LyXFont const & f) = 0;
 
        /// Draw a char at position x, y (y is the baseline)
@@ -182,6 +184,7 @@ public:
                             int & ascent = PainterBase::dummy2, 
                             int & descent = PainterBase::dummy3);
 protected:
+       ///
        WorkArea & owner;
 };