Fix deleting of paragraphs after undo (fix #236).

[lyx.git] / src / Painter.h

diff --git a/src/Painter.h b/src/Painter.h
index ba001988a45c41a2dcc74d00612b472225383276..6f338498150addf2c800460f9775040983411e4e 100644 (file)
--- a/src/Painter.h
+++ b/src/Painter.h
@@ -15,7 +15,6 @@
 #pragma interface
 #endif
 
-#include <config.h>
 #include "LString.h"
 
 // This is only included to provide stuff for the non-public sections
@@ -27,7 +26,6 @@ class LyXFont;
 class WorkArea;
 
 /** An inplementation for the X Window System. Xlib.
-    
     Classes similar to this one can be made for gtk+, Qt, etc.
 */
 class Painter : public PainterBase {
@@ -74,13 +72,11 @@ public:
        
        /// Fill a rectangle
        PainterBase & fillRectangle(int x, int y, int w, int h,
-                                   LColor::color = LColor::background);
+                                   LColor::color);
        
        /// For the graphics inset.
-       PainterBase & image(int x, int y, int w, int h, LyXImage const * image);
-       
-       /// For the figinset
-       PainterBase & pixmap(int x, int y, int w, int h, Pixmap bitmap);
+       PainterBase & image(int x, int y, int w, int h,
+                           grfx::GImage const & image);
        
        /// Draw a string at position x, y (y is the baseline)
        PainterBase & text(int x, int y,
@@ -93,16 +89,13 @@ public:
        
        /// Draw a char at position x, y (y is the baseline)
        PainterBase & text(int x, int y, char c, LyXFont const & f);
-
+       
        /// Draw a wide string at position x, y
        PainterBase & text(int x, int y, XChar2b const * str, int l,
-                  LyXFont const & f);  
+                          LyXFont const & f);  
 private:
        /// Check the font, and if set, draw an underline
        void underline(LyXFont const & f, int x, int y, int width);
-       
-       ///
-       Display * display;
 };
 
 #endif