NEW_INSETS changes, + some small things in insettabular.C

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 21a2d0cffb9f153b1dd1cf1a43dc89a2e28fba7f..23e2a30e666a01f1a097eef0627d489cb85f0100 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -18,6 +18,8 @@
 
 #include FORMS_H_LOCATION
 
+#include "Timeout.h"
+
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
@@ -25,20 +27,11 @@ class Intl;
 class Buffer;
 class Menus;
 class BufferView;
+class Dialogs;
 
-///
-struct  FD_form_main {
-       ///
-       FL_FORM * form_main;
-       ///
-       FL_OBJECT * timer_autosave;
-       ///
-       FL_OBJECT * timer_update;
-       ///
-       void * vdata;
-       ///
-       long ldata;
-};
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
 
 
 /**
@@ -46,7 +39,7 @@ struct  FD_form_main {
   view is supposed (at least IMHO) to be another class, that shows its output
   in one or more LyXView's.
  */
-class LyXView {
+class LyXView : public Object {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -72,9 +65,6 @@ public:
        ///
        BufferView * view() const;
 
-       /// returns a pointer to the main form.
-       FD_form_main * getMainForm() const;
-
        /// returns a pointer to the form.
        FL_FORM * getForm() const;
 
@@ -93,6 +83,9 @@ public:
        ///
        Intl * getIntl() const;
 
+       ///
+       Dialogs * getDialogs() { return dialogs_; }
+
        ///
        void updateLayoutChoice();
 
@@ -112,6 +105,8 @@ private:
        Menus * menus;
        ///
        Intl * intl;
+       ///
+       Dialogs * dialogs_;
 
        /** This is supposed to be a pointer or a list of pointers to the
           BufferViews currently being shown in the LyXView. So far
@@ -129,16 +124,13 @@ public:
        static int atCloseMainFormCB(FL_FORM *, void *);
        /// A callback
        void AutoSave();
-       /// A callback
-       static void UpdateTimerCB(FL_OBJECT *, long);
 private:
+       ///
+       Timeout autosave_timeout;
        /// makes the main form.
        void create_form_form_main(int width, int height);
        /// A pointer to the form.      
-       FD_form_main * form_main_;
-       /// A pointer to the form.      
        FL_FORM * form_;
-
        /** The last textclass layout list in the layout choice selector
          This should probably be moved to the toolbar, but for now it's
        here. (Asger) */