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 1d757c021f9d4da38339f54697a9cd99408cf135..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.
  *
  * ======================================================*/
 
@@ -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);
        ///
@@ -133,6 +133,10 @@ private:
        FL_OBJECT * work_area;
        ///
        FL_OBJECT * scrollbar;
+       ///
+       mutable FL_OBJECT * splash_;
+       ///
+       mutable FL_OBJECT * splash_text_;
        /// The pixmap overlay on the workarea
        Pixmap workareapixmap;
        ///