Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 18b10611c796ce68e1040099a1ff1c84da88df22..dc3e26a5413d2bcd4fc5a4296c1b38f7e4787acd 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -23,19 +23,11 @@
 #include FORMS_H_LOCATION
 #include "Painter.h"
 
-#ifdef SIGC_CXX_NAMESPACES
-using SigC::Signal0;
-using SigC::Signal2;
-using SigC::Signal3;
-#endif
-
-class BufferView;
-
 ///
 class WorkArea {
 public:
        ///
-       WorkArea(BufferView *, int xpos, int ypos, int width, int height);
+       WorkArea(int xpos, int ypos, int width, int height);
        ///
        ~WorkArea();
        ///
@@ -86,7 +78,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;
@@ -100,35 +92,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;
+       SigC::Signal0<void> workAreaExpose;
+       ///
+       SigC::Signal1<void, double> scrollCB;
        ///
-       Signal2<void, KeySym, unsigned int> workAreaKeyPress;
+       SigC::Signal2<void, KeySym, unsigned int> workAreaKeyPress;
        ///
-       Signal3<void, int, int, unsigned int> workAreaButtonPress;
+       SigC::Signal3<void, int, int, unsigned int> workAreaButtonPress;
        ///
-       Signal3<void, int, int, unsigned int> workAreaButtonRelease;
+       SigC::Signal3<void, int, int, unsigned int> workAreaButtonRelease;
        ///
-       Signal3<void, int, int, unsigned int> workAreaMotionNotify;
+       SigC::Signal3<void, int, int, unsigned int> workAreaMotionNotify;
        ///
-       Signal0<void> workAreaFocus;
+       SigC::Signal0<void> workAreaFocus;
        ///
-       Signal0<void> workAreaUnfocus;
+       SigC::Signal0<void> workAreaUnfocus;
        ///
-       Signal0<void> workAreaEnter;
+       SigC::Signal0<void> workAreaEnter;
        ///
-       Signal0<void> workAreaLeave;
+       SigC::Signal0<void> workAreaLeave;
        ///
-       Signal3<void, int, int, unsigned int> workAreaDoubleClick;
+       SigC::Signal3<void, int, int, unsigned int> workAreaDoubleClick;
        ///
-       Signal3<void, int, int, unsigned int> workAreaTripleClick;
+       SigC::Signal3<void, int, int, unsigned int> workAreaTripleClick;
 private:
        ///
        void createPixmap(int, int);
@@ -138,8 +129,6 @@ private:
        FL_OBJECT * work_area;
        ///
        FL_OBJECT * scrollbar;
-       ///
-       BufferView * owner_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///