John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / WorkArea.h

diff --git a/src/WorkArea.h b/src/WorkArea.h
index 503feb5b7b47e1245813668eaf02b4d189db16bf..c9f58b7fa9a3fe453cc815e0af8ff7a5527213e6 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);
        ///
@@ -103,32 +99,31 @@ public:
        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;
 private:
        ///
        void createPixmap(int, int);
@@ -139,7 +134,9 @@ private:
        ///
        FL_OBJECT * scrollbar;
        ///
-       BufferView * owner_;
+       mutable FL_OBJECT * splash_;
+       ///
+       mutable FL_OBJECT * splash_text_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///