Change glob() API to accept a dir parameter.

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

diff --git a/src/frontends/gtk/GWorkArea.h b/src/frontends/gtk/GWorkArea.h
index 9c9d14d47476f203be73ea05017c9645d6a66948..eaeb971e08d51815c61ed2662b4a23393ccaffc8 100644 (file)
--- a/src/frontends/gtk/GWorkArea.h
+++ b/src/frontends/gtk/GWorkArea.h
@@ -13,11 +13,12 @@
 #define GWORKAREA_H
 
 #include "GPainter.h"
-#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
 
 #include "frontends/WorkArea.h"
 
+#include <gtkmm.h>
+#include <gtk/gtk.h>
+
 #include <X11/Xft/Xft.h>
 
 class LColor_color;
@@ -28,11 +29,10 @@ namespace frontend {
 
 class ColorCache {
 public:
-       typedef std::map<LColor_color, Gdk::Color *> Map;
+       typedef std::map<LColor_color, boost::shared_ptr<Gdk::Color> > Map;
        typedef Map::iterator MapIt;
-       typedef std::map<LColor_color, XftColor *> Map2;
+       typedef std::map<LColor_color, boost::shared_ptr<XftColor> > Map2;
        typedef Map2::iterator MapIt2;
-       ~ColorCache();
        Gdk::Color * getColor(LColor_color);
        XftColor * getXftColor(LColor_color);
        void cacheColor(LColor_color, Gdk::Color *);
@@ -55,7 +55,7 @@ private:
 };
 
 
-class GWorkArea : public WorkArea, public SigC::Object {
+class GWorkArea : public WorkArea, public sigc::trackable {
 public:
        GWorkArea(LyXView & owner, int width, int height);
        ~GWorkArea();