prepare for 1.1.6pre2

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index b4a23c4b32936d693796febb09079449080987d8..8017453af51c88e2c90f1e80d9119653181f7626 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,23 +16,20 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
+#include "LString.h"
 #include "Timeout.h"
-
-// uncomment this line to try out the new menus
-#define NEW_MENUBAR 1
+#include <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
 class Intl;
 class Buffer;
-#ifdef NEW_MENUBAR
 class Menubar;
-#else
-class Menus;
-#endif
 
 class BufferView;
 class Dialogs;
@@ -47,7 +44,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);
@@ -59,7 +56,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();
@@ -80,7 +77,10 @@ public:
        Toolbar * getToolbar() const;
 
        /// sets the layout in the toolbar layout combox
-       void setLayout(int layout);
+       void setLayout(LyXTextClass::size_type layout);
+
+       /// update the toolbar
+       void updateToolbar();
 
        /// return a pointer to the lyxfunc
        LyXFunc * getLyXFunc() const;
@@ -88,16 +88,12 @@ public:
        /// return a pointer to the minibuffer
        MiniBuffer * getMiniBuffer() const;
 
-#ifdef NEW_MENUBAR
        ///
        Menubar * getMenubar() const;
 
        ///
        void updateMenubar();
-#else
-       ///
-       Menus * getMenus() const;
-#endif
+
        ///
        Intl * getIntl() const;
 
@@ -123,13 +119,8 @@ private:
        Toolbar * toolbar;
        /// 
        MiniBuffer * minibuffer;
-#ifdef NEW_MENUBAR
        ///
        Menubar * menubar;
-#else
-       ///
-       Menus * menus;
-#endif
        ///
        Intl * intl;
        ///
@@ -141,11 +132,7 @@ 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 *);