Dekel's patch -- I didn't fix the xforms-0.88 keysyms stuff so it still doesn't finis...

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index eb7a5c5a9b85401282e84a96b69713615866c11f..85f56b7fd73f02171ca5371cb8d099fe2415d811 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -19,13 +19,22 @@
 #include FORMS_H_LOCATION
 
 #include "Timeout.h"
+#include "support/utility.hpp"
+
+// uncomment this line to try out the new menus
+#define NEW_MENUBAR 1
 
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
 class Intl;
 class Buffer;
+#ifdef NEW_MENUBAR
+class Menubar;
+#else
 class Menus;
+#endif
+
 class BufferView;
 class Dialogs;
 
@@ -39,7 +48,7 @@ using SigC::Object;
   view is supposed (at least IMHO) to be another class, that shows its output
   in one or more LyXView's.
  */
-class LyXView : public Object {
+class LyXView : public Object, public noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -71,15 +80,28 @@ public:
        /// return a pointer to the toolbar
        Toolbar * getToolbar() const;
 
+       /// sets the layout in the toolbar layout combox
+       void setLayout(int layout);
+
+       /// update the toolbar
+       void updateToolbar();
+
        /// return a pointer to the lyxfunc
        LyXFunc * getLyXFunc() const;
 
        /// return a pointer to the minibuffer
        MiniBuffer * getMiniBuffer() const;
 
+#ifdef NEW_MENUBAR
        ///
-       Menus * getMenus() const;
+       Menubar * getMenubar() const;
 
+       ///
+       void updateMenubar();
+#else
+       ///
+       Menus * getMenus() const;
+#endif
        ///
        Intl * getIntl() const;
 
@@ -105,8 +127,13 @@ private:
        Toolbar * toolbar;
        /// 
        MiniBuffer * minibuffer;
+#ifdef NEW_MENUBAR
+       ///
+       Menubar * menubar;
+#else
        ///
        Menus * menus;
+#endif
        ///
        Intl * intl;
        ///
@@ -121,8 +148,10 @@ private:
        ///
        void UpdateDocumentClassChoice();
 public:
+#if FL_REVISION < 89
        ///
        static int KeyPressMask_raw_callback(FL_FORM *, void * xev);
+#endif
        /** This callback is run when a close event is sent from the
          window manager. */
        static int atCloseMainFormCB(FL_FORM *, void *);