remove Last when NEW_INSETS is defined

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 18b10611c796ce68e1040099a1ff1c84da88df22..7c00df597da8480065aa6e0f56b4d9b5d69df6c2 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -25,17 +25,17 @@
 
 #ifdef SIGC_CXX_NAMESPACES
 using SigC::Signal0;
+using SigC::Signal1;
 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 +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;
@@ -100,16 +100,15 @@ 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;
        ///
+       Signal1<void, double> scrollCB;
+       ///
        Signal2<void, KeySym, unsigned int> workAreaKeyPress;
        ///
        Signal3<void, int, int, unsigned int> workAreaButtonPress;
@@ -138,8 +137,6 @@ private:
        FL_OBJECT * work_area;
        ///
        FL_OBJECT * scrollbar;
-       ///
-       BufferView * owner_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///