reverse last change

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

diff --git a/src/frontends/LyXView.h b/src/frontends/LyXView.h
index 5a478650a9b90726942a4c00f37610d3a441cbf1..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
@@ -120,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;
 
@@ -135,7 +137,7 @@ public:
 
        /// dispatch to current BufferView
        void dispatch(FuncRequest const & req);
- 
+
 protected:
        /// view of a buffer. Eventually there will be several.
        boost::shared_ptr<BufferView> bufferview_;
@@ -144,8 +146,6 @@ protected:
        boost::scoped_ptr<Menubar> menubar_;
        /// view's toolbar
        boost::scoped_ptr<Toolbar> toolbar_;
-       /// view's command buffer controller
-       boost::scoped_ptr<ControlCommandBuffer> const controlcommand_;
 
 private:
        /**
@@ -166,6 +166,12 @@ private:
        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