#pragma interface
#endif
+#include <config.h>
#include FORMS_H_LOCATION
-#include "Timeout.h"
-#include "support/utility.hpp"
-
-// uncomment this line to try out the new menus
-#define NEW_MENUBAR 1
+#include "LString.h"
+#include "frontends/Timeout.h"
+#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;
-#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, public noncopyable {
+class LyXView : public SigC::Object, boost::noncopyable {
public:
/// constructor
LyXView(int w, int h);
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();
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();
/// 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;
/// Updates the title of the window
void updateWindowTitle();
-
/// Show state (toolbar and font in minibuffer)
void showState();
Toolbar * toolbar;
///
MiniBuffer * minibuffer;
-#ifdef NEW_MENUBAR
///
Menubar * menubar;
-#else
- ///
- Menus * menus;
-#endif
///
Intl * intl;
///
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 *);