prepare for 1.1.6pre2

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 7e994aeb435aec84f952f94ef0d40b81b3de424e..8017453af51c88e2c90f1e80d9119653181f7626 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 <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
@@ -76,7 +77,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();
@@ -132,10 +133,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 *);