remove Last when NEW_INSETS is defined

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 651b2a033c96c45d7a8e9620e019845083d80bfa..7c00df597da8480065aa6e0f56b4d9b5d69df6c2 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -18,23 +18,24 @@
 
 #include <utility>
 
-//#include <sigc++/signal_system.h>
+#include <sigc++/signal_system.h>
 
 #include FORMS_H_LOCATION
 #include "Painter.h"
 
-//#ifdef SIGC_CXX_NAMESPACES
-//using SigC::Signal0;
-//using SigC::Signal3;
-//#endif
-
-class BufferView;
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Signal0;
+using SigC::Signal1;
+using SigC::Signal2;
+using SigC::Signal3;
+#endif
 
 
+///
 class WorkArea {
 public:
        ///
-       WorkArea(BufferView *, int xpos, int ypos, int width, int height);
+       WorkArea(int xpos, int ypos, int width, int height);
        ///
        ~WorkArea();
        ///
@@ -85,7 +86,7 @@ public:
                return fl_get_scrollbar_value(scrollbar);
        }
        ///
-       std::pair<float, float> getScrollbarBounds() const {
+       std::pair<float, float> const getScrollbarBounds() const {
                std::pair<float, float> p;
                fl_get_scrollbar_bounds(scrollbar, &p.first, &p.second);
                return p;
@@ -99,33 +100,34 @@ public:
        /// xforms callback
        static void scroll_cb(FL_OBJECT *, long);
        ///
-       string getClipboard() const;
+       string const getClipboard() const;
        ///
        void putClipboard(string const &) const;
-       ///
-       BufferView * owner() const { return owner_; }
-
        // Signals
        ///
-       //Signal0<void> workAreaExpose;
+       Signal0<void> workAreaExpose;
        ///
-       //Signal3<void, int, int, unsigned int> workAreaButtonPress;
+       Signal1<void, double> scrollCB;
        ///
-       //Signal3<void, int, int, unsigned int> workAreaButtonRelease;
+       Signal2<void, KeySym, unsigned int> workAreaKeyPress;
        ///
-       //Signal3<void, int, int, unsigned int> workAreaMotionNotify;
+       Signal3<void, int, int, unsigned int> workAreaButtonPress;
        ///
-       //Signal0<void> workAreaFocus;
+       Signal3<void, int, int, unsigned int> workAreaButtonRelease;
        ///
-       //Signal0<void> workAreaUnfocus;
+       Signal3<void, int, int, unsigned int> workAreaMotionNotify;
        ///
-       //Signal0<void> workAreaEnter;
+       Signal0<void> workAreaFocus;
        ///
-       //Signal0<void> workAreaLeave;
+       Signal0<void> workAreaUnfocus;
        ///
-       //Signal3<void, int, int, unsigned int> workAreaDoubleClick;
+       Signal0<void> workAreaEnter;
        ///
-       //Signal3<void, int, int, unsigned int> workAreaTripleClick;
+       Signal0<void> workAreaLeave;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaDoubleClick;
+       ///
+       Signal3<void, int, int, unsigned int> workAreaTripleClick;
 private:
        ///
        void createPixmap(int, int);
@@ -135,13 +137,13 @@ private:
        FL_OBJECT * work_area;
        ///
        FL_OBJECT * scrollbar;
-       ///
-       BufferView * owner_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///
        Painter painter_;
        ///
        FL_OBJECT * figinset_canvas;
+       /// if we call redraw with true needed for locking-insets
+       bool screen_cleared;
 };
 #endif