Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / gtk / GPainter.h

diff --git a/src/frontends/gtk/GPainter.h b/src/frontends/gtk/GPainter.h
index 7f06c28b6f50dec24647d597be760a021278cd9a..1874f5f464edb62cece1b352f26fed0064a780f5 100644 (file)
--- a/src/frontends/gtk/GPainter.h
+++ b/src/frontends/gtk/GPainter.h
@@ -6,20 +6,25 @@
  *
  * \author Huang Ying
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef GPAINTER_H
 #define GPAINTER_H
 
-#include <config.h>
+#include "frontends/Painter.h"
+
+#include <gtkmm.h>
+
 #include <X11/Xft/Xft.h>
 
 #include <map>
-#include "frontends/Painter.h"
-#include "LString.h"
 
 class LyXFont;
+
+namespace lyx {
+namespace frontend {
+
 class GWorkArea;
 
 /**
@@ -34,15 +39,15 @@ public:
        /// return the height of the work area in pixels
        virtual int paperHeight() const;
 
-       void setForeground(Glib::RefPtr<Gdk::GC> gc, LColor::color clr);
+       void setForeground(Glib::RefPtr<Gdk::GC> gc, LColor_color clr);
        void setLineParam(Glib::RefPtr<Gdk::GC> gc,
                          line_style ls, line_width lw);
-       XftColor * getXftColor(LColor::color clr);
+       XftColor * getXftColor(LColor_color clr);
        /// draw a line from point to point
-       virtual Painter & line(
+       virtual void line(
                int x1, int y1,
                int x2, int y2,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -52,72 +57,72 @@ public:
         * @param yp array of points' y co-ords
         * @param np size of the points array
         */
-       virtual Painter & lines(
+       virtual void lines(
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin);
 
        /// draw a rectangle
-       virtual Painter & rectangle(
+       virtual void rectangle(
                int x, int y,
                int w, int h,
-               LColor::color = LColor::foreground,
+               LColor_color,
                line_style = line_solid,
                line_width = line_thin);
 
        /// draw a filled rectangle
-       virtual Painter & fillRectangle(
+       virtual void fillRectangle(
                int x, int y,
                int w, int h,
-               LColor::color);
+               LColor_color);
 
        /// draw a filled (irregular) polygon
-       virtual Painter & fillPolygon(
+       virtual void fillPolygon(
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground);
+               LColor_color);
 
        /// draw an arc
-       virtual Painter & arc(
+       virtual void arc(
                int x, int y,
                unsigned int w, unsigned int h,
                int a1, int a2,
-               LColor::color = LColor::foreground);
+               LColor_color);
 
        /// draw a pixel
-       virtual Painter & point(
+       virtual void point(
                int x, int y,
-               LColor::color = LColor::foreground);
+               LColor_color);
 
        /// draw an image from the image cache
-       virtual Painter & image(int x, int y,
+       virtual void image(int x, int y,
                int w, int h,
-               lyx::graphics::Image const & image);
+               graphics::Image const & image);
 
        /// draw a string at position x, y (y is the baseline)
-       virtual Painter & text(int x, int y,
-               string const & str, LyXFont const & f);
+       virtual void text(int x, int y,
+               std::string const & str, LyXFont const & f);
 
        /** Draw a string at position x, y (y is the baseline)
         *  This is just for fast drawing
         */
-       virtual Painter & text(int x, int y,
+       virtual void text(int x, int y,
                char const * str, size_t l,
                LyXFont const & f);
 
-        virtual Painter & text(int x, int y, wchar_t const * str, int l,
+       virtual void text(int x, int y, wchar_t const * str, int l,
                               LyXFont const & f);
 
        /// draw a char at position x, y (y is the baseline)
-       virtual Painter & text(int x, int y,
+       virtual void text(int x, int y,
                               char c, LyXFont const & f);
 
        /// draw a wide string at position x, y
-       Painter & text(int x, int y,
+       void text(int x, int y,
                XChar2b const * str, size_t l,
                LyXFont const & f);
 
@@ -126,4 +131,7 @@ private:
        GWorkArea & owner_;
 };
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // XPAINTER_H