FL_OBJECT * bubble_timer = reinterpret_cast<FL_OBJECT *>(ob->u_cdata);
// We do not test for empty help here, since this can never happen
- if(event == FL_ENTER){
+ if (event == FL_ENTER){
fl_set_object_callback(bubble_timer,
C_Toolbar_BubbleTimerCB,
reinterpret_cast<long>(ob));
fl_set_timer(bubble_timer, 1);
}
- else if(event != FL_MOTION){
+ else if (event != FL_MOTION){
fl_set_timer(bubble_timer, 0);
fl_hide_oneliner();
}
for (LyXTextClass::const_iterator cit = tc.begin();
cit != end; ++cit) {
if ((*cit).obsoleted_by().empty())
- combox->addline(_((*cit).name().c_str()));
+ combox->addline(_((*cit).name()));
else
- combox->addline(("@N" + string(_((*cit).name().c_str()))).c_str());
+ combox->addline("@N" + _((*cit).name()));
}
}
// we need to do this.
combox->Redraw();
}
+
void Toolbar::Pimpl::clearLayoutList()
{
if (combox) {
}
}
+
void Toolbar::Pimpl::openLayoutList()
{
if (combox)
combox->Show();
}
+
static
void ToolbarCB(FL_OBJECT * ob, long ac)
{
LyXView * owner = static_cast<LyXView *>(ob->u_vdata);
string res = owner->getLyXFunc()->Dispatch(int(ac));
- if(!res.empty())
+ if (!res.empty())
lyxerr[Debug::GUI] << "ToolbarCB: Function returned: "
<< res << endl;
}
ToolbarCB(ob, data);
}
+
#if 0
// What are we supposed to do with that??
int Toolbar::get_toolbar_func(string const & func)
}
if (act == LFUN_INSERT_MATH && !arg.empty()) {
- lyxerr[Debug::GUI] << "Using mathed-provided icon" << endl;
char const ** pixmap = get_pixmap_from_symbol(arg.c_str(),
buttonwidth,
height);
- fl_set_pixmapbutton_data(obj, const_cast<char **>(pixmap));
- return;
+ if (pixmap) {
+ lyxerr[Debug::GUI] << "Using mathed-provided icon"
+ << endl;
+ fl_set_pixmapbutton_data(obj,
+ const_cast<char **>(pixmap));
+ return;
+ }
}
lyxerr << "Unable to find icon `" << xpm_name << "'" << endl;
ToolbarList::iterator item = toollist.begin();
ToolbarList::iterator end = toollist.end();
for (; item != end; ++item) {
- switch(item->action){
+ switch (item->action){
case ToolbarDefaults::SEPARATOR:
xpos += sepspace;
break;