Small fixes

[lyx.git] / src / Painter.h

diff --git a/src/Painter.h b/src/Painter.h
index 8798428e7523af966ebd158312bff4385c030d76..6470a8b445165cb726ef65a9ba7a42682970b1ba 100644 (file)
--- a/src/Painter.h
+++ b/src/Painter.h
@@ -22,7 +22,6 @@
 #include <X11/Xlib.h>
 
 #include "PainterBase.h"
-#include "LColor.h"
 
 class LyXFont;
 class WorkArea;
@@ -36,7 +35,6 @@ public:
        /// Constructor 
        explicit Painter(WorkArea &);
        
-       /**@Basic drawing routines */
        /// Draw a line from point to point
        PainterBase & line(int x1, int y1, int x2, int y2, 
                           LColor::color = LColor::foreground,
@@ -78,30 +76,31 @@ public:
        PainterBase & fillRectangle(int x, int y, int w, int h,
                                    LColor::color = LColor::background);
        
-       /**@Image stuff */
+       /// For the graphics inset.
+       PainterBase & image(int x, int y, int w, int h, LyXImage const * image);
        
-       /// For the figure inset
+       /// For the figinset
        PainterBase & pixmap(int x, int y, int w, int h, Pixmap bitmap);
        
-       /**@String functions */
-       
        /// Draw a string at position x, y (y is the baseline)
        PainterBase & text(int x, int y,
                           string const & str, LyXFont const & f);
        
        /** 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);  
 private:
        /// Check the font, and if set, draw an underline
        void underline(LyXFont const & f, int x, int y, int width);
        
-       /**@Low level X parameters */
        ///
        Display * display;
 };