X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.h;h=8017453af51c88e2c90f1e80d9119653181f7626;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=85f56b7fd73f02171ca5371cb8d099fe2415d811;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git

diff --git a/src/LyXView.h b/src/LyXView.h
index 85f56b7fd7..8017453af5 100644
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,24 +16,20 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
+#include "LString.h"
 #include "Timeout.h"
-#include "support/utility.hpp"
-
-// 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;
@@ -60,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();
@@ -81,7 +77,7 @@ 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();
@@ -92,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;
 
@@ -127,13 +119,8 @@ private:
 	Toolbar * toolbar;
 	/// 
 	MiniBuffer * minibuffer;
-#ifdef NEW_MENUBAR
 	///
 	Menubar * menubar;
-#else
-	///
-	Menus * menus;
-#endif
 	///
 	Intl * intl;
 	///
@@ -145,13 +132,7 @@ private:
 	BufferView * bufferview;
 	///
 	void invalidateLayoutChoice();
-	///
-	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 *);