make LyX work better when run from a directory which name contains spaces or other...

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

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index ea4c42d08d9e3165b2e04fc921c51a06e60e6555..3f2acfe95291dbca68a52f3b98545aa28d117c78 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -7,17 +7,12 @@
  * \author Lars Gullik Bjønnes
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYXVIEW_H
 #define LYXVIEW_H
 
-
-#include "LString.h"
-
-#include "support/types.h"
-
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
@@ -25,10 +20,10 @@
 #include <boost/signals/signal0.hpp>
 
 class Buffer;
-class Toolbar;
+class Toolbars;
+class InsetBase;
 class Intl;
 class Menubar;
-class ControlCommandBuffer;
 
 class BufferView;
 class Dialogs;
@@ -37,6 +32,12 @@ class LyXFont;
 class Timeout;
 class FuncRequest;
 
+namespace lyx {
+namespace frontend {
+class ControlCommandBuffer;
+} // namespace frontend
+} // namespace lyx
+
 /**
  * LyXView - main LyX window
  *
@@ -84,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 & getToolbasr() const { return *toolbars_.get(); }
 
        /// return the menubar for this view
        Menubar & getMenubar() { return *menubar_.get(); }
@@ -106,12 +107,12 @@ public:
        //@}
 
        /// sets the layout in the toolbar layout selection
-       void setLayout(string const & layout);
+       void setLayout(std::string const & layout);
        /// updates the possible layouts selectable
        void updateLayoutChoice();
 
        /// update the toolbar
-       void updateToolbar();
+       void updateToolbars();
        /// update the menubar
        void updateMenubar();
 
@@ -122,7 +123,7 @@ public:
        boost::signal0<void> view_state_changed;
 
        /// display a message in the view
-       virtual void message(string const &) = 0;
+       virtual void message(std::string const &) = 0;
 
        /// clear any temporary message and replace with current status
        virtual void clearMessage() = 0;
@@ -134,7 +135,12 @@ public:
        void resetAutosaveTimer();
 
        /// dispatch to current BufferView
-       void dispatch(FuncRequest const & req);
+       void dispatch(FuncRequest const & cmd);
+
+       /** redraw \c inset in all the BufferViews in which it is currently
+        *  visible. If successful return a pointer to the owning Buffer.
+        */
+       Buffer const * const updateInset(InsetBase const *) const;
 
 protected:
        /// view of a buffer. Eventually there will be several.
@@ -142,8 +148,6 @@ protected:
 
        /// view's menubar
        boost::scoped_ptr<Menubar> menubar_;
-       /// view's toolbar
-       boost::scoped_ptr<Toolbar> toolbar_;
 
 private:
        /**
@@ -151,11 +155,13 @@ private:
         * @param t main window title
         * @param it iconified (short) title
         */
-       virtual void setWindowTitle(string const & t, string const & it) = 0;
+       virtual void setWindowTitle(std::string const & t, std::string const & it) = 0;
 
        /// 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
@@ -169,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