Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / LyXView.h

diff --git a/src/LyXView.h b/src/LyXView.h
index 9072a3ccf0f3a07677b2042d1f5107c89e6d6934..d82a83c504cf65ef5ab4f2028ed6379eafdbd931 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,11 +16,12 @@
 #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;
@@ -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, public boost::noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -132,10 +128,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 *);