Indentation change + small #ifndef NEW_INSETS fix.

[lyx.git] / src / PainterBase.h

diff --git a/src/PainterBase.h b/src/PainterBase.h
index 11624821e7a614b82ba3b3d52305255d487b66f0..bd9832925616f2f68b9eb265d67d02f7f5907d25 100644 (file)
--- a/src/PainterBase.h
+++ b/src/PainterBase.h
@@ -20,6 +20,7 @@
 
 class WorkArea;
 class LyXFont;
+class LyXImage;
 
 /** A painter class to encapsulate all graphics parameters and operations
    
@@ -93,7 +94,7 @@ public:
        virtual PainterBase & fillPolygon(
                int const * xp, int const * yp,
                int np,
-               LColor::color =LColor::foreground) = 0;
+               LColor::color = LColor::foreground) = 0;
 
        /// Draw lines from x1,y1 to x2,y2. They are arrays
         virtual PainterBase & segments(
@@ -146,18 +147,16 @@ public:
        
        
        // 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;
+       virtual PainterBase & image(int x, int y, int w, int h, LyXImage const * image) = 0;
 
        
        /// 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)