read changelog

[features.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index abbc288d0d8d99e828d4e1adf1ca1f461db71647..1d10fc9db451713740a4c38d5f452cf0c45159cb 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -21,8 +21,6 @@
 #include "LaTeX.h"
 #include "undo.h"
 
-#define NEW_WA 1
-
 class LyXView;
 class Buffer;
 class LyXScreen;
@@ -43,19 +41,12 @@ public:
        ///
        Painter & painter();
 #endif
-#ifdef NEW_WA
        ///
        WorkArea * getWorkArea() { return workarea; }
-#else
-       ///
-       FL_OBJECT * getWorkArea() { return work_area; }
-#endif
        ///
        void buffer(Buffer * b);
-#ifdef NEW_WA
        ///
        void resize(int, int, int, int);
-#endif
        ///
        void resize();
        ///
@@ -195,23 +186,14 @@ private:
        
        /// Update pixmap of screen
        void updateScreen();
-#ifdef NEW_WA
        ///
        void workAreaExpose();
        ///
        void ScrollUpOnePage();
        ///
        void ScrollDownOnePage();
-#else
-       ///
-       int workAreaExpose();
        ///
-       void ScrollUpOnePage(long /*time*/);
-       ///
-       void ScrollDownOnePage(long /*time*/);
-#endif
-       ///
-       void create_view(int, int, int, int);
+       void create_view();
        ///
        Inset * checkInsetHit(int & x, int & y);
        /// 
@@ -220,8 +202,6 @@ private:
        int ScrollDown(long time);
 
 public:
-
-#ifdef NEW_WA
        ///
        bool focus() const;
        ///
@@ -234,28 +214,20 @@ public:
        void ScrollCB(double);
        /// A callback for the down arrow in the scrollbar.
        void DownCB(long time, int button);
-#else
-       /// A callback for the up arrow in the scrollbar.
-       static void UpCB(FL_OBJECT * ob, long);
-       /// A callback for the slider in the scrollbar.
-       static void ScrollCB(FL_OBJECT * ob, long);
-
-       /// A callback for the down arrow in the scrollbar.
-       static void DownCB(FL_OBJECT * ob, long);
-#endif
 
        ///
        static void CursorToggleCB(FL_OBJECT * ob, long);
+#if 0
        /** Work area free object handler
         */
        static int work_area_handler(FL_OBJECT *, int event,
                                     FL_Coord, FL_Coord, int key, void *xev);
+#endif
 
        ///
        void SetState();
 
 private:
-#ifdef NEW_WA
        ///
        void WorkAreaMotionNotify(int x, int y, unsigned int state);
        ///
@@ -264,27 +236,6 @@ private:
        void WorkAreaButtonRelease(int x, int y, unsigned int button);
        ///
        void WorkAreaSelectionNotify(Window win, XEvent * event);
-#else
-       ///
-       int WorkAreaMotionNotify(FL_OBJECT * ob,
-                                Window win,
-                                int w, int h,
-                                XEvent * ev, void * d);
-       ///
-       int WorkAreaButtonPress(FL_OBJECT * ob,
-                               Window win,
-                               int w, int h,
-                               XEvent * ev, void * d);
-       ///
-       int WorkAreaButtonRelease(FL_OBJECT * ob,
-                                 Window win,
-                                 int w, int h,
-                                 XEvent * ev, void * d);
-       ///
-       int WorkAreaSelectionNotify(FL_OBJECT *, Window win,
-                                   int /*w*/, int /*h*/,
-                                   XEvent * event, void * /*d*/);
-#endif
        ///
        LyXView * owner_;
        ///
@@ -297,16 +248,6 @@ private:
        bool lyx_focus;
        ///
        bool work_area_focus;
-#ifndef NEW_WA
-       ///
-       FL_OBJECT * work_area;
-       ///
-       FL_OBJECT * scrollbar;
-       ///
-       FL_OBJECT * button_down;
-       ///
-       FL_OBJECT * button_up;
-#endif
        ///
        FL_OBJECT * figinset_canvas;
        ///
@@ -315,10 +256,8 @@ private:
         BackStack backstack;
        ///
        int last_click_x, last_click_y;
-#ifdef NEW_WA
        ///
        WorkArea * workarea;
-#endif
 };
 
 #endif