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

[lyx.git] / src / Painter.h

diff --git a/src/Painter.h b/src/Painter.h
index 1becb41462cf5b8f83973d6d2e81985bff10a05a..6f338498150addf2c800460f9775040983411e4e 100644 (file)
--- a/src/Painter.h
+++ b/src/Painter.h
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  *      
- *         Copyright 1995-2000 The LyX Team
+ *         Copyright 1995-2001 The LyX Team
  *
  * ======================================================*/
 
@@ -15,20 +15,17 @@
 #pragma interface
 #endif
 
-#include "config.h"
 #include "LString.h"
 
 // This is only included to provide stuff for the non-public sections
 #include <X11/Xlib.h>
 
 #include "PainterBase.h"
-#include "LColor.h"
 
 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 {
@@ -75,10 +72,11 @@ public:
        
        /// Fill a rectangle
        PainterBase & fillRectangle(int x, int y, int w, int h,
-                                   LColor::color = LColor::background);
+                                   LColor::color);
        
-       /// For the figure inset
-       PainterBase & pixmap(int x, int y, int w, int h, Pixmap bitmap);
+       /// For the graphics inset.
+       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,
@@ -86,21 +84,18 @@ public:
        
        /** Draw a string at position x, y (y is the baseline)
            This is just for fast drawing */
-       PainterBase & text(int x, int y, char const * str, int l,
+       PainterBase & text(int x, int y, char const * str, size_t l,
                           LyXFont const & f);
        
        /// 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