Finish the task of removing all cruft from the header files.

[lyx.git] / src / frontends / controllers / GUI.h

diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h
index e7d01fe3847e07e2450553cbb19822098cebf06d..ab4cfcd60c8ba4bc247139fa31b42ff819ac421d 100644 (file)
--- a/src/frontends/controllers/GUI.h
+++ b/src/frontends/controllers/GUI.h
@@ -4,18 +4,19 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Angus Leeming 
+ * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef GUI_H
 #define GUI_H
 
-#include "ButtonController.h"
-
 #include <boost/utility.hpp>
 
+class LyXView;
+class Dialogs;
+
 /** This class makes a whole out of the disparate parts of a dialog.
  */
 template <typename Controller, typename GUIview,
@@ -28,13 +29,10 @@ public:
        Controller & controller() { return controller_; }
        ///
        Controller const & controller() const { return controller_; }
-
 private:
        ///
        Controller controller_;
        ///
-       ButtonController<Policy, GUIbc> bc_;
-       ///
        GUIview view_;
 };
 
@@ -46,8 +44,9 @@ GUI<Controller, GUIview, Policy, GUIbc>::GUI(LyXView & lv, Dialogs & d)
          view_()
 {
        controller_.setView(view_);
-       controller_.setButtonController(bc_);
        view_.setController(controller_);
+       controller_.bc().view(new GUIbc(controller_.bc()));
+       controller_.bc().bp(new Policy);
 }
 
 #endif // GUI_H