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 e8c99e22cb669163b12463bb5d4f1528714a6a9f..23e2a30e666a01f1a097eef0627d489cb85f0100 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -29,11 +29,9 @@ class Menus;
 class BufferView;
 class Dialogs;
 
-///
-struct  FD_form_main {
-       ///
-       FL_FORM * form_main;
-};
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
 
 
 /**
@@ -41,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);
@@ -67,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;
 
@@ -129,16 +124,12 @@ public:
        static int atCloseMainFormCB(FL_FORM *, void *);
        /// A callback
        void AutoSave();
-       /// A callback
-       static void UpdateTimerCB(void *);
 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