#include <boost/bind.hpp>
#include <algorithm>
-#include "frontends/controllers/ControlMath.h"
-
namespace lyx {
using support::compare_ascii_no_case;
ToolbarItem::ToolbarItem(Type type, string const & name, docstring const & label)
- : type_(type), name_(name), label_(label)
+ : type_(type), label_(label), name_(name)
{
}
}
-ToolbarInfo const & ToolbarBackend::getToolbar(string const & name) const
+ToolbarInfo const * ToolbarBackend::getDefinedToolbarInfo(string const & name) const
{
- Toolbars::const_iterator cit = find_if(toolbars.begin(), toolbars.end(), ToolbarNamesEqual(name));
- if (cit == toolbars.end())
- lyxerr << "No toolbar named " << name << endl;
- BOOST_ASSERT(cit != toolbars.end());
- return (*cit);
+ Toolbars::const_iterator it = find_if(toolbars.begin(), toolbars.end(), ToolbarNamesEqual(name));
+ if (it == toolbars.end())
+ return 0;
+ return &(*it);
}
-ToolbarInfo & ToolbarBackend::getToolbar(string const & name)
+ToolbarInfo * ToolbarBackend::getUsedToolbarInfo(string const &name)
{
- Toolbars::iterator it = find_if(toolbars.begin(), toolbars.end(), ToolbarNamesEqual(name));
- if (it == toolbars.end())
- lyxerr << "No toolbar named " << name << endl;
- BOOST_ASSERT(it != toolbars.end());
- return (*it);
+ Toolbars::iterator it = find_if(usedtoolbars.begin(), usedtoolbars.end(), ToolbarNamesEqual(name));
+ if (it == usedtoolbars.end())
+ return 0;
+ return &(*it);
}
-
} // namespace lyx