apply the ostream changes to mathed, some other small related things

[features.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 99cf3d538fbad3ec692ba1c5174b7775c232ba8a..28c6febd4ed14f435bb1ba1083384fa8673c418e 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -17,6 +17,7 @@
 #endif
 
 #include <utility>
+using std::pair;
 
 #include FORMS_H_LOCATION
 #include "Painter.h"
@@ -29,10 +30,8 @@ public:
        WorkArea(BufferView *, int xpos, int ypos, int width, int height);
        ///
        ~WorkArea();
-#ifdef USE_PAINTER
        ///
        Painter & getPainter() { return painter_; }
-#endif
        ///
        int workWidth() const { return work_area->w; }
        ///
@@ -61,6 +60,8 @@ public:
        ///
        bool active() const { return work_area->active; }
        ///
+       bool belowMouse() const;
+       ///
        bool visible() const { return work_area->form->visible; }
        ///
        void greyOut() const;
@@ -84,37 +85,6 @@ public:
        }
        ///
        Pixmap getPixmap() const { return workareapixmap; }
-       ///
-       //Signal2<long, int> up;
-       ///
-       //Signal2<long, int> down;
-       ///
-       //Signal1<double> scroll;
-       ///
-       //Signal0 expose;
-       ///
-       //Signal3<int, int, unsigned int> buttonPress;
-       ///
-       //Signal3<int, int, unsigned int> buttonRelease;
-       ///
-       //Signal3<int, int, unsigned int> motion;
-       ///
-       //Signal0 focus;
-       ///
-       //Signal0 unfocus;
-       ///
-       //Signal0 enter;
-       ///
-       //Signal0 leave;
-       ///
-       //Signal3<int, int, unsigned int> doubleclick;
-       ///
-       //Signal3<int, int, unsigned int> trippleclick;
-       ///
-       //Signal2<Window, XEvent *> selection;
-private:
-       ///
-       void createPixmap(int, int);
        /// xforms callback
        static int work_area_handler(FL_OBJECT *, int event,
                                     FL_Coord, FL_Coord,
@@ -125,6 +95,9 @@ private:
        static void down_cb(FL_OBJECT *, long);
        /// xforms callback
        static void scroll_cb(FL_OBJECT *, long);
+private:
+       ///
+       void createPixmap(int, int);
        ///
        FL_OBJECT * backgroundbox;
        ///     
@@ -139,10 +112,8 @@ private:
        BufferView * owner;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
-#ifdef USE_PAINTER
        ///
        Painter painter_;
-#endif
        ///
        FL_OBJECT * figinset_canvas;
 };