small changes to ButtonController usage

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index f4f82c6907a3e7daae7a567e5f6abbf12fee5fcd..85f56b7fd73f02171ca5371cb8d099fe2415d811 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -19,6 +19,7 @@
 #include FORMS_H_LOCATION
 
 #include "Timeout.h"
+#include "support/utility.hpp"
 
 // uncomment this line to try out the new menus
 #define NEW_MENUBAR 1
@@ -47,7 +48,7 @@ using SigC::Object;
   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);
@@ -147,8 +148,10 @@ private:
        ///
        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 *);