X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.h;h=8017453af51c88e2c90f1e80d9119653181f7626;hb=f448e22d483e1370bcbfbb7be8cb47ad7251ed77;hp=5fab87d125d46d90059c00ccdb8a44c3ae381f95;hpb=105116682d41fd297782175c05c7384d71d1942e;p=lyx.git

diff --git a/src/LyXView.h b/src/LyXView.h
index 5fab87d125..8017453af5 100644
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,26 +16,35 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
+#include "LString.h"
 #include "Timeout.h"
+#include <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
 class Intl;
 class Buffer;
-class Menus;
+class Menubar;
+
 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 noncopyable {
 public:
 	/// constructor
 	LyXView(int w, int h);
@@ -47,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();
@@ -67,6 +76,12 @@ public:
 	/// return a pointer to the 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() const;
 
@@ -74,7 +89,10 @@ public:
 	MiniBuffer * getMiniBuffer() const;
 
 	///
-	Menus * getMenus() const;
+	Menubar * getMenubar() const;
+
+	///
+	void updateMenubar();
 
 	///
 	Intl * getIntl() const;
@@ -88,6 +106,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:
@@ -98,7 +120,7 @@ private:
 	/// 
 	MiniBuffer * minibuffer;
 	///
-	Menus * menus;
+	Menubar * menubar;
 	///
 	Intl * intl;
 	///
@@ -110,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 *);