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();
}
}
else
fl_activate_object(p->icon);
+ } else if (p->action == ToolbarDefaults::LAYOUTS && combox) {
+ if (owner->getLyXFunc()->getStatus(LFUN_LAYOUT).disabled())
+ combox->deactivate();
+ else
+ combox->activate();
}
}
}
{
string const & layoutguiname = combox->getline();
LyXTextClass const & tc =
- textclasslist.TextClass(owner->buffer()->
- params.textclass);
+ textclasslist[owner->buffer()->params.textclass];
LyXTextClass::const_iterator end = tc.end();
for (LyXTextClass::const_iterator cit = tc.begin();
}
-void Toolbar::Pimpl::setLayout(int layout)
+void Toolbar::Pimpl::setLayout(string const & layout)
{
if (combox) {
LyXTextClass const & tc =
- textclasslist.TextClass(owner->buffer()->
- params.textclass);
+ textclasslist[owner->buffer()->params.textclass];
combox->select(_(tc[layout].name()));
}
}
if (combox->empty() || force) {
combox->clear();
LyXTextClass const & tc =
- textclasslist.TextClass(owner->buffer()->
- params.textclass);
+ textclasslist[owner->buffer()->params.textclass];
LyXTextClass::const_iterator end = tc.end();
for (LyXTextClass::const_iterator cit = tc.begin();
cit != end; ++cit) {
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;