Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 5fab87d125d46d90059c00ccdb8a44c3ae381f95..f4f82c6907a3e7daae7a567e5f6abbf12fee5fcd 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -20,22 +20,34 @@
 
 #include "Timeout.h"
 
+// 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;
 
+#ifdef SIGC_CXX_NAMESPACES
+using SigC::Object;
+#endif
+
 
 /**
   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 : public SigC::Object {
+class LyXView : public Object {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -67,15 +79,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;
 
@@ -88,6 +113,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:
@@ -97,8 +126,13 @@ private:
        Toolbar * toolbar;
        /// 
        MiniBuffer * minibuffer;
+#ifdef NEW_MENUBAR
+       ///
+       Menubar * menubar;
+#else
        ///
        Menus * menus;
+#endif
        ///
        Intl * intl;
        ///