#include FORMS_H_LOCATION
#include "Timeout.h"
+#include "support/utility.hpp"
+
+// 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;
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);
/// 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;
Toolbar * toolbar;
///
MiniBuffer * minibuffer;
+#ifdef NEW_MENUBAR
+ ///
+ Menubar * menubar;
+#else
///
Menus * menus;
+#endif
///
Intl * intl;
///
///
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 *);