X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXView.h;h=cb2465781f7ac66ba11c53bb501e29c89c5e8a2a;hb=dbd7a961fc46bb10c85bdd8c7fb6626477ae63d8;hp=f4f82c6907a3e7daae7a567e5f6abbf12fee5fcd;hpb=b8072fd6f77ebd592ecd514dadc04839516b8a8b;p=lyx.git

diff --git a/src/LyXView.h b/src/LyXView.h
index f4f82c6907..cb2465781f 100644
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -1,71 +1,47 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
- *
- * ====================================================== */
-
-#ifndef LyXView_H
-#define LyXView_H
+
+#ifndef LYXVIEW_BASE_H
+#define LYXVIEW_BASE_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include FORMS_H_LOCATION
-
-#include "Timeout.h"
+#include <boost/utility.hpp>
+#include <sigc++/signal_system.h>
 
-// uncomment this line to try out the new menus
-#define NEW_MENUBAR 1
+#include "LString.h"
+#include "support/types.h"
 
-class LyXFunc;
+class Buffer;
 class Toolbar;
 class MiniBuffer;
 class Intl;
-class Buffer;
-#ifdef NEW_MENUBAR
 class Menubar;
-#else
-class Menus;
-#endif
 
 class BufferView;
 class Dialogs;
+class LyXFunc;
+class Timeout;
 
-#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 Object {
+///
+class LyXView : public SigC::Object, boost::noncopyable {
 public:
-	/// constructor
-	LyXView(int w, int h);
-
-	/// destructor
-	~LyXView();
-
-	/// Where to place the form.
-	void setPosition(int, int);
-
-	/// Show the main form.
-	void show(int, int, char const * t = "LyX");
-
-	/// init (should probably be removed later) (Lgb)
-	void init();
-
+	///
+	LyXView();
+	///
+	virtual ~LyXView();
+	///
+	virtual void init() = 0;
+	///
+	virtual void setPosition(int, int) = 0;
+	///
+	virtual void show(int, int, string const &) = 0;
 	/// Redraw the main form.
-	void redraw();
+	virtual void redraw() = 0;
+
+	/// Resize all BufferViews in this LyXView (because the width changed)
+	void resize();
 
 	/// returns the buffer currently shown in the main form.
 	Buffer * buffer() const;
@@ -73,15 +49,11 @@ public:
 	///
 	BufferView * view() const;
 
-	/// returns a pointer to the form.
-	FL_FORM * getForm() const;
-
 	/// return a pointer to the toolbar
 	Toolbar * getToolbar() const;
 
 	/// sets the layout in the toolbar layout combox
-	void setLayout(int layout);
-
+	void setLayout(string const & layout);
 	/// update the toolbar
 	void updateToolbar();
 
@@ -91,16 +63,19 @@ public:
 	/// return a pointer to the minibuffer
 	MiniBuffer * getMiniBuffer() const;
 
-#ifdef NEW_MENUBAR
+	///
+	void message(string const &);
+	///
+	void messagePush(string const & str);
+	///
+	void messagePop();
+	
 	///
 	Menubar * getMenubar() const;
 
 	///
 	void updateMenubar();
-#else
-	///
-	Menus * getMenus() const;
-#endif
+
 	///
 	Intl * getIntl() const;
 
@@ -113,54 +88,41 @@ public:
 	/// Updates the title of the window
 	void updateWindowTitle();
 
-
 	/// Show state (toolbar and font in minibuffer)
 	void showState();
 
 	/// Reset autosave timer
 	void resetAutosaveTimer();
-private:
-	/// 
-	LyXFunc * lyxfunc;
-	/// 
-	Toolbar * toolbar;
-	/// 
-	MiniBuffer * minibuffer;
-#ifdef NEW_MENUBAR
 	///
-	Menubar * menubar;
-#else
+	virtual void prohibitInput() const = 0;
 	///
-	Menus * menus;
-#endif
+	virtual void allowInput() const = 0;
+protected:
 	///
-	Intl * intl;
-	///
-	Dialogs * dialogs_;
-
+	Menubar * menubar;
+	/// 
+	Toolbar * toolbar;
 	/** This is supposed to be a pointer or a list of pointers to the
 	   BufferViews currently being shown in the LyXView. So far
 	   this is not used, but that should change pretty soon. (Lgb) */
 	BufferView * bufferview;
+	/// 
+	MiniBuffer * minibuffer;
 	///
-	void invalidateLayoutChoice();
+	Intl * intl;
 	///
-	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 *);
+	Timeout * autosave_timeout;
 	/// A callback
 	void AutoSave();
+	///
+	void invalidateLayoutChoice();
 private:
+	/// 
+	LyXFunc * lyxfunc;
+	///
+	Dialogs * dialogs_;
 	///
-	Timeout autosave_timeout;
-	/// makes the main form.
-	void create_form_form_main(int width, int height);
-	/// A pointer to the form.	
-	FL_FORM * form_;
+	virtual void setWindowTitle(string const &, string const &) = 0;
 	/** The last textclass layout list in the layout choice selector
 	  This should probably be moved to the toolbar, but for now it's
 	here. (Asger) */