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 b3807cfc04ba6293e2b90b8e37abd7329dba5236..23e2a30e666a01f1a097eef0627d489cb85f0100 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -27,26 +27,11 @@ class Intl;
 class Buffer;
 class Menus;
 class BufferView;
+class Dialogs;
 
-///
-struct  FD_form_main {
-       ///
-       FL_FORM * form_main;
-#if 0
-       ///
-       FL_OBJECT * timer_autosave;
-#endif
-#if 0
-       ///
-       FL_OBJECT * timer_update;
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
 #endif
-#if 0
-       ///
-       void * vdata;
-       ///
-       long ldata;
-#endif
-};
 
 
 /**
@@ -54,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);
@@ -80,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;
 
@@ -101,6 +83,9 @@ public:
        ///
        Intl * getIntl() const;
 
+       ///
+       Dialogs * getDialogs() { return dialogs_; }
+
        ///
        void updateLayoutChoice();
 
@@ -120,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
@@ -137,20 +124,12 @@ public:
        static int atCloseMainFormCB(FL_FORM *, void *);
        /// A callback
        void AutoSave();
-       /// A callback
-       static void UpdateTimerCB(void *);
-#if 1
-       ///
-       //Timeout update_timeout;
-#endif
 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