fix "make dist" target

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index eb7a5c5a9b85401282e84a96b69713615866c11f..04c292b7c55fce38443d6e6d3231b302dd585da6 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,30 +16,30 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
-#include "Timeout.h"
+#include "LString.h"
+#include "frontends/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 Object {
+class LyXView : public SigC::Object, boost::noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -51,7 +51,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();
@@ -71,6 +71,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;
 
@@ -78,7 +84,17 @@ public:
        MiniBuffer * getMiniBuffer() const;
 
        ///
-       Menus * getMenus() const;
+       void message(string const &);
+       ///
+       void messagePush(string const & str);
+       ///
+       void messagePop();
+       
+       ///
+       Menubar * getMenubar() const;
+
+       ///
+       void updateMenubar();
 
        ///
        Intl * getIntl() const;
@@ -92,7 +108,6 @@ public:
        /// Updates the title of the window
        void updateWindowTitle();
 
-
        /// Show state (toolbar and font in minibuffer)
        void showState();
 
@@ -106,7 +121,7 @@ private:
        /// 
        MiniBuffer * minibuffer;
        ///
-       Menus * menus;
+       Menubar * menubar;
        ///
        Intl * intl;
        ///
@@ -118,11 +133,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 *);