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 8264a8bb700a787235d5e52effbbbdec454bda2b..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;
@@ -26,14 +27,12 @@ class LyXView;
 namespace lyx {
 namespace frontend {
 
-class ColorCache
-{
-       typedef std::map<LColor_color, Gdk::Color *> Map;
+class ColorCache {
+public:
+       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;
-public:
-       ~ColorCache();
        Gdk::Color * getColor(LColor_color);
        XftColor * getXftColor(LColor_color);
        void cacheColor(LColor_color, Gdk::Color *);
@@ -46,10 +45,9 @@ private:
 
 extern ColorCache colorCache;
 
-class ColorHandler
-{
+class ColorHandler {
 public:
-       ColorHandler(GWorkArea& owner) : owner_(owner) {}
+       ColorHandler(GWorkArea & owner) : owner_(owner) {}
        XftColor * getXftColor(LColor_color clr);
        Gdk::Color * getGdkColor(LColor_color clr);
 private:
@@ -57,8 +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();
@@ -93,11 +90,12 @@ private:
        bool onExpose(GdkEventExpose * event);
        bool onConfigure(GdkEventConfigure * event);
        void onScroll();
+       bool onScrollWheel(GdkEventScroll * event);
        bool onButtonPress(GdkEventButton * event);
        bool onButtonRelease(GdkEventButton * event);
        bool onMotionNotify(GdkEventMotion * event);
        bool onKeyPress(GdkEventKey * event);
-       void onClipboardGet(Gtk::SelectionData& selection_data, guint info);
+       void onClipboardGet(Gtk::SelectionData & selection_data, guint info);
        void onClipboardClear();
        Gtk::HBox hbox_;
        Gtk::DrawingArea workArea_;