Remove unused font variable which caused a warning.

[lyx.git] / src / PainterBase.h

diff --git a/src/PainterBase.h b/src/PainterBase.h
index bd9832925616f2f68b9eb265d67d02f7f5907d25..237f7f13d1a9847e1c58877c0f1e851154fbd4ab 100644 (file)
--- a/src/PainterBase.h
+++ b/src/PainterBase.h
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright 1998-2000 The LyX Team
+ *         Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
 
@@ -137,7 +137,7 @@ public:
        /// Fill a rectangle
        virtual PainterBase & fillRectangle(
                int x, int y, int w, int h,
-               LColor::color = LColor::background) = 0;
+               LColor::color) = 0;
        
        /// A filled rectangle with the shape of a 3D button
        virtual PainterBase & button(int x, int y, int w, int h);
@@ -161,7 +161,8 @@ public:
 
        /// Draw a char at position x, y (y is the baseline)
        virtual PainterBase & text(int x, int y, char c, LyXFont const & f)=0;
-       
+
+#if 0
        /** Draws a string and encloses it inside a rectangle. Returns
            the size of the rectangle. If draw is false, we only calculate
            the size. */
@@ -182,6 +183,22 @@ public:
                             int & width = PainterBase::dummy1,
                             int & ascent = PainterBase::dummy2, 
                             int & descent = PainterBase::dummy3);
+#else
+       /** Draws a string and encloses it inside a rectangle. Returns
+           the size of the rectangle. If draw is false, we only calculate
+           the size. */
+       PainterBase & rectText(int x, int baseline, 
+                          string const & string, 
+                          LyXFont const & font,
+                          LColor::color back,
+                              LColor::color frame);
+
+       /** Draw a string and encloses it inside a button frame. Returns
+           the size of the frame. If draw is false, we only calculate
+           the size. */
+       PainterBase & buttonText(int x, int baseline, string const & s,
+                                LyXFont const & font);
+#endif
 protected:
        ///
        WorkArea & owner;