fix math fonts with LyX/Mac

[lyx.git] / src / frontends / LyXView.h

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 82d72e4baeb7a68b0aea6a6d7913768ec6b03813..623eb53be027524d2ad41badcee31f6c4f2ea251 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -13,18 +13,17 @@
 #ifndef LYXVIEW_H
 #define LYXVIEW_H
 
-#include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/utility.hpp>
 
 class Buffer;
-class Toolbar;
+class Toolbars;
 class InsetBase;
 class Intl;
 class Menubar;
-class ControlCommandBuffer;
 
 class BufferView;
 class Dialogs;
@@ -33,6 +32,12 @@ class LyXFont;
 class Timeout;
 class FuncRequest;
 
+namespace lyx {
+namespace frontend {
+class ControlCommandBuffer;
+} // namespace frontend
+} // namespace lyx
+
 /**
  * LyXView - main LyX window
  *
@@ -80,9 +85,9 @@ public:
        LyXFunc const & getLyXFunc() const { return *lyxfunc_.get(); }
 
        /// return the toolbar for this view
-       Toolbar & getToolbar() { return *toolbar_.get(); }
+       Toolbars & getToolbars() { return *toolbars_.get(); }
        ///
-       Toolbar const & getToolbar() const { return *toolbar_.get(); }
+       Toolbars const & getToolbars() const { return *toolbars_.get(); }
 
        /// return the menubar for this view
        Menubar & getMenubar() { return *menubar_.get(); }
@@ -107,15 +112,15 @@ public:
        void updateLayoutChoice();
 
        /// update the toolbar
-       void updateToolbar();
+       void updateToolbars();
        /// update the menubar
        void updateMenubar();
 
        /// focus the command buffer (minibuffer)
-       boost::signal0<void> focus_command_buffer;
+       boost::signal<void()> focus_command_buffer;
 
        /// view state string changed
-       boost::signal0<void> view_state_changed;
+       boost::signal<void()> view_state_changed;
 
        /// display a message in the view
        virtual void message(std::string const &) = 0;
@@ -143,8 +148,6 @@ protected:
 
        /// view's menubar
        boost::scoped_ptr<Menubar> menubar_;
-       /// view's toolbar
-       boost::scoped_ptr<Toolbar> toolbar_;
 
 private:
        /**
@@ -157,6 +160,8 @@ private:
        /// called on timeout
        void autoSave();
 
+       /// view's toolbar
+       boost::scoped_ptr<Toolbars> toolbars_;
        /// keyboard mapping object
        boost::scoped_ptr<Intl> const intl_;
        /// auto-saving of buffers
@@ -170,7 +175,10 @@ protected:
        /// view's command buffer controller
        // this has to be declared _after_ lyxfunc_ as its initialization depends
        // on it!
-       boost::scoped_ptr<ControlCommandBuffer> const controlcommand_;
+       typedef boost::scoped_ptr<lyx::frontend::ControlCommandBuffer>
+       CommandBufferPtr;
+
+       CommandBufferPtr const controlcommand_;
 };
 
 #endif // LYXVIEW_H