fix "make dist" target

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 7e994aeb435aec84f952f94ef0d40b81b3de424e..04c292b7c55fce38443d6e6d3231b302dd585da6 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,12 +16,13 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
 #include "LString.h"
-#include "Timeout.h"
-#include "support/utility.hpp"
-
+#include "frontends/Timeout.h"
+#include <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
@@ -33,17 +34,12 @@ 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, public noncopyable {
+class LyXView : public SigC::Object, boost::noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -76,7 +72,7 @@ public:
        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();
@@ -87,6 +83,13 @@ public:
        /// return a pointer to the minibuffer
        MiniBuffer * getMiniBuffer() const;
 
+       ///
+       void message(string const &);
+       ///
+       void messagePush(string const & str);
+       ///
+       void messagePop();
+       
        ///
        Menubar * getMenubar() const;
 
@@ -105,7 +108,6 @@ public:
        /// Updates the title of the window
        void updateWindowTitle();
 
-
        /// Show state (toolbar and font in minibuffer)
        void showState();
 
@@ -132,10 +134,6 @@ private:
        ///
        void invalidateLayoutChoice();
 public:
-#if 0
-       ///
-       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 *);