Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 376a89a97d1155f5df39361f1d6f73e24559cccb..651b2a033c96c45d7a8e9620e019845083d80bfa 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -18,9 +18,16 @@
 
 #include <utility>
 
+//#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;
 
 
@@ -33,7 +40,7 @@ public:
        ///
        Painter & getPainter() { return painter_; }
        ///
-       unsigned int workWidth() const { return work_area->w; }
+       int workWidth() const { return work_area->w; }
        ///
        unsigned int width() const { return work_area->w + scrollbar->w; }
        ///
@@ -95,6 +102,30 @@ public:
        string getClipboard() const;
        ///
        void putClipboard(string const &) const;
+       ///
+       BufferView * owner() const { return owner_; }
+
+       // Signals
+       ///
+       //Signal0<void> workAreaExpose;
+       ///
+       //Signal3<void, int, int, unsigned int> workAreaButtonPress;
+       ///
+       //Signal3<void, int, int, unsigned int> workAreaButtonRelease;
+       ///
+       //Signal3<void, int, int, unsigned int> workAreaMotionNotify;
+       ///
+       //Signal0<void> workAreaFocus;
+       ///
+       //Signal0<void> workAreaUnfocus;
+       ///
+       //Signal0<void> workAreaEnter;
+       ///
+       //Signal0<void> workAreaLeave;
+       ///
+       //Signal3<void, int, int, unsigned int> workAreaDoubleClick;
+       ///
+       //Signal3<void, int, int, unsigned int> workAreaTripleClick;
 private:
        ///
        void createPixmap(int, int);
@@ -105,7 +136,7 @@ private:
        ///
        FL_OBJECT * scrollbar;
        ///
-       BufferView * owner;
+       BufferView * owner_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///