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 f4f82c6907a3e7daae7a567e5f6abbf12fee5fcd..d82a83c504cf65ef5ab4f2028ed6379eafdbd931 100644 (file)
--- a/src/LyXView.h
+++ b/src/LyXView.h
@@ -16,38 +16,30 @@
 #pragma interface
 #endif
 
+#include <config.h>
 #include FORMS_H_LOCATION
 
-#include "Timeout.h"
-
-// uncomment this line to try out the new menus
-#define NEW_MENUBAR 1
+#include "LString.h"
+#include "frontends/Timeout.h"
+#include <boost/utility.hpp>
+#include "layout.h"
 
 class LyXFunc;
 class Toolbar;
 class MiniBuffer;
 class Intl;
 class Buffer;
-#ifdef NEW_MENUBAR
 class Menubar;
-#else
-class Menus;
-#endif
 
 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, public boost::noncopyable {
 public:
        /// constructor
        LyXView(int w, int h);
@@ -59,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();
@@ -80,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();
@@ -91,16 +83,12 @@ public:
        /// return a pointer to the minibuffer
        MiniBuffer * getMiniBuffer() const;
 
-#ifdef NEW_MENUBAR
        ///
        Menubar * getMenubar() const;
 
        ///
        void updateMenubar();
-#else
-       ///
-       Menus * getMenus() const;
-#endif
+
        ///
        Intl * getIntl() const;
 
@@ -126,13 +114,8 @@ private:
        Toolbar * toolbar;
        /// 
        MiniBuffer * minibuffer;
-#ifdef NEW_MENUBAR
        ///
        Menubar * menubar;
-#else
-       ///
-       Menus * menus;
-#endif
        ///
        Intl * intl;
        ///
@@ -144,11 +127,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 *);