reverse last change

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

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index e41c1f02b52db16e9cb2a4bd7e7d762148a6ad46..450df75be67c0442c92d8c616345d453d6dd7b5c 100644 (file)
--- a/src/frontends/LyXView.h
+++ b/src/frontends/LyXView.h
@@ -1,11 +1,13 @@
 // -*- C++ -*-
 /**
  * \file LyXView.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes <larsbj@lyx.org>
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author Lars Gullik Bjønnes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef LYXVIEW_H
@@ -36,6 +38,7 @@ class Dialogs;
 class LyXFunc;
 class LyXFont;
 class Timeout;
+class FuncRequest;
 
 /**
  * LyXView - main LyX window
@@ -77,23 +80,33 @@ public:
         */
        boost::shared_ptr<BufferView> const & view() const;
 
-       /// return the LyX function handler for this view
-       LyXFunc * getLyXFunc() const;
-
        /// return the buffer currently shown in this window
        Buffer * buffer() const;
 
+       /// return the LyX function handler for this view
+       LyXFunc & getLyXFunc() { return *lyxfunc_.get(); }
+       ///
+       LyXFunc const & getLyXFunc() const { return *lyxfunc_.get(); }
+
        /// return the toolbar for this view
-       Toolbar * getToolbar() const;
+       Toolbar & getToolbar() { return *toolbar_.get(); }
+       ///
+       Toolbar const & getToolbar() const { return *toolbar_.get(); }
 
        /// return the menubar for this view
-       Menubar * getMenubar() const;
+       Menubar & getMenubar() { return *menubar_.get(); }
+       ///
+       Menubar const & getMenubar() const { return *menubar_.get(); }
 
        /// get access to the dialogs
-       Dialogs * getDialogs() { return dialogs_.get(); }
+       Dialogs & getDialogs() { return *dialogs_.get(); }
+       ///
+       Dialogs const & getDialogs() const { return *dialogs_.get(); }
 
        /// get this view's keyboard map handler
-       Intl * getIntl() const;
+       Intl & getIntl() { return *intl_.get(); }
+       ///
+       Intl const & getIntl() const { return *intl_.get(); }
 
        //@}
 
@@ -109,7 +122,7 @@ public:
 
        /// focus the command buffer (minibuffer)
        boost::signal0<void> focus_command_buffer;
- 
+
        /// view state string changed
        boost::signal0<void> view_state_changed;
 
@@ -122,25 +135,17 @@ public:
        /// reset autosave timer
        void resetAutosaveTimer();
 
+       /// dispatch to current BufferView
+       void dispatch(FuncRequest const & req);
+
 protected:
-       /// view of a buffer. FuncRequestually there will be several.
+       /// view of a buffer. Eventually there will be several.
        boost::shared_ptr<BufferView> bufferview_;
 
        /// view's menubar
        boost::scoped_ptr<Menubar> menubar_;
        /// view's toolbar
        boost::scoped_ptr<Toolbar> toolbar_;
-       /// view's command buffer controller
-       boost::scoped_ptr<ControlCommandBuffer> controlcommand_;
-
-       /// keyboard mapping object
-       boost::scoped_ptr<Intl> intl_;
-
-       /// auto-saving of buffers
-       boost::scoped_ptr<Timeout> autosave_timeout_;
-
-       /// called on timeout
-       void autoSave();
 
 private:
        /**
@@ -150,10 +155,23 @@ private:
         */
        virtual void setWindowTitle(string const & t, string const & it) = 0;
 
+       /// called on timeout
+       void autoSave();
+
+       /// keyboard mapping object
+       boost::scoped_ptr<Intl> const intl_;
+       /// auto-saving of buffers
+       boost::scoped_ptr<Timeout> const autosave_timeout_;
        /// our function handler
        boost::scoped_ptr<LyXFunc> lyxfunc_;
        /// dialogs for this view
        boost::scoped_ptr<Dialogs> dialogs_;
+
+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_;
 };
 
 #endif // LYXVIEW_H