Martin's changes to the Note inset.

[lyx.git] / src / frontends / Toolbar.C

diff --git a/src/frontends/Toolbar.C b/src/frontends/Toolbar.C
index 123b15d06f64ba6030e93c79f018391143ee6f2e..e9045711c853c801a9a0bc810943b72eff1044d4 100644 (file)
--- a/src/frontends/Toolbar.C
+++ b/src/frontends/Toolbar.C
@@ -13,84 +13,57 @@
 
 #include "Toolbar.h"
 #include "ToolbarBackend.h"
-#include "Toolbar_pimpl.h"
 #include "debug.h"
 #include "LyXAction.h"
 
 using std::endl;
 
-Toolbar::Toolbar(LyXView * o, int x, int y)
+Toolbar::Toolbar()
        : last_textclass_(-1)
 {
-       pimpl_ = new Pimpl(o, x, y);
+}
 
-       // extracts the toolbars from the backend
-       ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
-       ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
 
-       for (; cit != end; ++cit)
-               pimpl_->add(*cit);
+Toolbar::~Toolbar()
+{
 }
 
 
-Toolbar::~Toolbar()
+void Toolbar::init() 
 {
-       delete pimpl_;
+       // extracts the toolbars from the backend
+       ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
+       ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
+
+       for (; cit != end; ++cit)
+               add(*cit);
 }
 
 
 void Toolbar::update(bool in_math, bool in_table)
 {
-       pimpl_->update();
+       update();
 
        // extracts the toolbars from the backend
        ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin();
        ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end();
 
        for (; cit != end; ++cit) {
-               switch (cit->display_type) {
-                       case ToolbarBackend::OFF:
-                       case ToolbarBackend::ON:
-                               break;
-                       case ToolbarBackend::MATH:
-                               pimpl_->displayToolbar(*cit, in_math);
-                               break;
-                       case ToolbarBackend::TABLE:
-                               pimpl_->displayToolbar(*cit, in_table);
-                               break;
-               }
+               if (cit->flags & ToolbarBackend::MATH)
+                       displayToolbar(*cit, in_math);
+               else if (cit->flags & ToolbarBackend::TABLE)
+                       displayToolbar(*cit, in_table);
        }
 }
 
 
-
-void Toolbar::setLayout(string const & layout)
-{
-       pimpl_->setLayout(layout);
-}
-
-
 bool Toolbar::updateLayoutList(int textclass)
 {
        // update the layout display
        if (last_textclass_ != textclass) {
-               pimpl_->updateLayoutList(true);
+               updateLayoutList();
                last_textclass_ = textclass;
                return true;
-       } else {
-               pimpl_->updateLayoutList(false);
+       } else
                return false;
-       }
-}
-
-
-void Toolbar::openLayoutList()
-{
-       pimpl_->openLayoutList();
-}
-
-
-void Toolbar::clearLayoutList()
-{
-       pimpl_->clearLayoutList();
 }