diff options
| -rw-r--r-- | dw/fltkui.cc | 14 | ||||
| -rw-r--r-- | src/menu.cc | 2 | ||||
| -rw-r--r-- | src/ui.cc | 2 | ||||
| -rw-r--r-- | src/uicmd.cc | 1 |
4 files changed, 9 insertions, 10 deletions
diff --git a/dw/fltkui.cc b/dw/fltkui.cc index ccccc711..8c8f5aad 100644 --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -260,7 +260,7 @@ FltkLabelButtonResource::~FltkLabelButtonResource () new ::fltk::Button (allocation->x, allocation->y, allocation->width, allocation->ascent + allocation->descent, label); - button->set_flag (::fltk::RAW_LABEL); + button->clear_flag (SHORTCUT_LABEL); button->callback (widgetCallback, this); button->when (FL_WHEN_RELEASE); return button; @@ -720,7 +720,7 @@ FltkCheckButtonResource::~FltkCheckButtonResource () ::fltk::CheckButton *cb = new ::fltk::CheckButton (allocation->x, allocation->y, allocation->width, allocation->ascent + allocation->descent); - cb->set_flag (::fltk::RAW_LABEL); + cb->clear_flag (SHORTCUT_LABEL); return cb; } @@ -833,7 +833,7 @@ void FltkRadioButtonResource::buttonClicked () new ::fltk::RadioButton (allocation->x, allocation->y, allocation->width, allocation->ascent + allocation->descent); - button->set_flag (::fltk::RAW_LABEL); + button->clear_flag (SHORTCUT_LABEL); button->when (FL_WHEN_CHANGED); button->callback (widgetCallback, this); button->type (::fltk::Button::TOGGLE); @@ -864,7 +864,7 @@ template <class I> ::fltk::Item *FltkSelectionResource<I>::Item::createNewWidget (int index) { ::fltk::Item *item = new ::fltk::Item (name); - item->set_flag (::fltk::RAW_LABEL); + item->clear_flag (SHORTCUT_LABEL); item->user_data ((void *) index); return item; } @@ -874,7 +874,7 @@ template <class I> FltkSelectionResource<I>::Item::createNewGroupWidget () { ::fltk::ItemGroup *itemGroup = new ::fltk::ItemGroup (name); - itemGroup->set_flag (::fltk::RAW_LABEL); + itemGroup->clear_flag (SHORTCUT_LABEL); itemGroup->user_data ((void *) -1L); return itemGroup; } @@ -1076,7 +1076,7 @@ FltkOptionMenuResource::~FltkOptionMenuResource () new ::fltk::Choice (allocation->x, allocation->y, allocation->width, allocation->ascent + allocation->descent); - menu->set_flag (::fltk::RAW_LABEL); + menu->clear_flag (SHORTCUT_LABEL); menu->callback(widgetCallback,this); return menu; } @@ -1147,7 +1147,7 @@ FltkListResource::~FltkListResource () allocation->ascent + allocation->descent); if (mode == SELECTION_MULTIPLE) menu->type(::fltk::Browser::MULTI); - menu->set_flag (::fltk::RAW_LABEL); + menu->clear_flag (SHORTCUT_LABEL); menu->callback(widgetCallback,this); menu->when(FL_WHEN_CHANGED); return menu; diff --git a/src/menu.cc b/src/menu.cc index 37d78938..37ddd3f1 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -412,7 +412,7 @@ void a_Menu_page_popup(BrowserWindow *bw, const DilloUrl *url, } i = new Item(label); - i->set_flag(RAW_LABEL); + i->clear_flag(SHORTCUT_LABEL); i->user_data(a_Url_dup(url)); i->callback(Menu_stylesheet_cb); stylesheets->add(i); @@ -705,7 +705,7 @@ UI::UI(int x, int y, int ww, int wh, const char* label, const UI *cur_ui) : TopGroup = new PackedGroup(0, 0, ww, wh); add(TopGroup); resizable(TopGroup); - set_flag(RAW_LABEL); + clear_flag(SHORTCUT_LABEL); if (cur_ui) { PanelSize = cur_ui->PanelSize; diff --git a/src/uicmd.cc b/src/uicmd.cc index bfc35ed9..c0f18487 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -421,7 +421,6 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, win->shortcut(0); // Ignore Escape if (prefs.buffered_drawing != 2) win->clear_double_buffer(); - win->set_flag(RAW_LABEL); CustTabGroup *DilloTabs = new CustTabGroup(0, 0, ww, wh); DilloTabs->clear_tab_to_focus(); DilloTabs->selection_color(156); |