Some more fixes to compiler warnings.

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index df91b43618dbd5d77ebb8f0974cca1725ca066d4..eb1bf551ff0a1855a6d8ef1124381d81ece880ac 100644 (file)
--- a/src/WorkArea.h
+++ b/src/WorkArea.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *        
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ======================================================*/
 
@@ -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();
        ///
@@ -44,12 +36,16 @@ public:
        int workWidth() const { return work_area->w; }
        ///
        unsigned int width() const { return work_area->w + scrollbar->w; }
+       //unsigned int width() const { return backgroundbox->w + 15; }
        ///
        unsigned int height() const { return work_area->h; }
+       //unsigned int height() const { return backgroundbox->h; }
        ///
        int xpos() const { return work_area->x; }
+       //int xpos() const { return backgroundbox->x; }
        ///
        int ypos() const { return work_area->y; }
+       //int ypos() const { return backgroundbox->y; }
        ///
        void resize(int xpos, int ypos, int width, int height);
        ///
@@ -86,7 +82,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;
@@ -99,39 +95,48 @@ public:
                                     int /*key*/, void * xev);
        /// xforms callback
        static void scroll_cb(FL_OBJECT *, long);
+       /// a selection exists
+       void haveSelection(bool) const;
        ///
-       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;
+       /// emitted when an X client has requested our selection
+       SigC::Signal0<void> selectionRequested;
+       /// emitted when another X client has stolen our selection
+       SigC::Signal0<void> selectionLost;
+ 
+       /// handles SelectionRequest X Event, to fill the clipboard
+       void event_cb(XEvent * xev);
 private:
        ///
        void createPixmap(int, int);
+ 
        ///
        FL_OBJECT * backgroundbox;
        ///     
@@ -139,12 +144,16 @@ private:
        ///
        FL_OBJECT * scrollbar;
        ///
-       BufferView * owner_;
+       mutable FL_OBJECT * splash_;
+       ///
+       mutable FL_OBJECT * splash_text_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///
        Painter painter_;
        ///
        FL_OBJECT * figinset_canvas;
+       /// if we call redraw with true needed for locking-insets
+       bool screen_cleared;
 };
 #endif