Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index c2cbe062d0bb6d8ca6bfdd9c6810d981f7ccb249..d82a83c504cf65ef5ab4f2028ed6379eafdbd931 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,36 +16,30 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
-#include "buffer.h"
-#include "menus.h"
+
+#include "LString.h"
+#include "frontends/Timeout.h"
+#include <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
 class Intl;
+class Buffer;
+class Menubar;
 
-///
-struct  FD_form_main {
-       ///
-       FL_FORM * form_main;
-       ///
-       FL_OBJECT * timer_autosave;
-       ///
-       FL_OBJECT * timer_update;
-       ///
-       void * vdata;
-       ///
-       long ldata;
-};
-
+class BufferView;
+class Dialogs;
 
 /**
   This class is the form containing the view of the buffer. The actual buffer
   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 SigC::Object, public boost::noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -57,7 +51,7 @@ public:
        void setPosition(int, int);
 
        /// Show the main form.
-       void show(int, int, char const * t = "LyX");
+       void show(int, int, string const & t = string("LyX"));
 
        /// init (should probably be removed later) (Lgb)
        void init();
@@ -66,31 +60,40 @@ public:
        void redraw();
 
        /// returns the buffer currently shown in the main form.
-       Buffer * buffer() const { return bufferview->buffer(); }
+       Buffer * buffer() const;
 
        ///
-       BufferView * view() { return bufferview; }
-
-       /// returns a pointer to the main form.
-       FD_form_main * getMainForm() { return _form_main; }
+       BufferView * view() const;
 
        /// returns a pointer to the form.
-       FL_FORM * getForm() { return _form; }
+       FL_FORM * getForm() const;
 
        /// return a pointer to the toolbar
-       Toolbar * getToolbar() { return toolbar; }
+       Toolbar * getToolbar() const;
+
+       /// sets the layout in the toolbar layout combox
+       void setLayout(LyXTextClass::size_type layout);
+
+       /// update the toolbar
+       void updateToolbar();
 
        /// return a pointer to the lyxfunc
-       LyXFunc * getLyXFunc() { return lyxfunc; }
+       LyXFunc * getLyXFunc() const;
 
        /// return a pointer to the minibuffer
-       MiniBuffer * getMiniBuffer() { return minibuffer; }
+       MiniBuffer * getMiniBuffer() const;
 
        ///
-       Menus * getMenus() { return menus; }
+       Menubar * getMenubar() const;
 
        ///
-       Intl * getIntl() { return intl; }
+       void updateMenubar();
+
+       ///
+       Intl * getIntl() const;
+
+       ///
+       Dialogs * getDialogs() { return dialogs_; }
 
        ///
        void updateLayoutChoice();
@@ -98,6 +101,10 @@ public:
        /// Updates the title of the window
        void updateWindowTitle();
 
+
+       /// Show state (toolbar and font in minibuffer)
+       void showState();
+
        /// Reset autosave timer
        void resetAutosaveTimer();
 private:
@@ -108,9 +115,11 @@ private:
        /// 
        MiniBuffer * minibuffer;
        ///
-       Menus * menus;
+       Menubar * menubar;
        ///
        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
@@ -118,26 +127,19 @@ private:
        BufferView * bufferview;
        ///
        void invalidateLayoutChoice();
-       ///
-       void UpdateDocumentClassChoice();
 public:
-       ///
-       static int KeyPressMask_raw_callback(FL_FORM *, void * xev);
        /** This callback is run when a close event is sent from the
          window manager. */
        static int atCloseMainFormCB(FL_FORM *, void *);
        /// A callback
-       static void AutosaveTimerCB(FL_OBJECT *, long);
-       /// A callback
-       static void UpdateTimerCB(FL_OBJECT *, long);
+       void AutoSave();
 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;
-
+       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) */