Some more fixes to compiler warnings.

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 1d757c021f9d4da38339f54697a9cd99408cf135..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.
  *
  * ======================================================*/
 
@@ -35,17 +35,17 @@ 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 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; }
+       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 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; }
+       int ypos() const { return work_area->y; }
+       //int ypos() const { return backgroundbox->y; }
        ///
        void resize(int xpos, int ypos, int width, int height);
        ///
@@ -95,6 +95,8 @@ public:
                                     int /*key*/, void * xev);
        /// xforms callback
        static void scroll_cb(FL_OBJECT *, long);
+       /// a selection exists
+       void haveSelection(bool) const;
        ///
        string const getClipboard() const;
        ///
@@ -124,15 +126,27 @@ public:
        SigC::Signal3<void, int, int, unsigned int> workAreaDoubleClick;
        ///
        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;
        ///     
        FL_OBJECT * work_area;
        ///
        FL_OBJECT * scrollbar;
+       ///
+       mutable FL_OBJECT * splash_;
+       ///
+       mutable FL_OBJECT * splash_text_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///