changeset 1806:6e5e5125dd97

RAW_LABEL is SHORTCUT_LABEL
author corvid <corvid@lavabit.com>
date Thu, 06 Jan 2011 18:36:36 +0000
parents 808f25a92644
children 407a73983ed5
files dw/fltkui.cc src/menu.cc src/ui.cc src/uicmd.cc
diffstat 4 files changed, 9 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/dw/fltkui.cc	Thu Jan 06 17:37:40 2011 +0000
+++ b/dw/fltkui.cc	Thu Jan 06 18:36:36 2011 +0000
@@ -260,7 +260,7 @@
         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 @@
    ::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 @@
       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 @@
 ::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 @@
 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 @@
       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 @@
                            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;
--- a/src/menu.cc	Thu Jan 06 17:37:40 2011 +0000
+++ b/src/menu.cc	Thu Jan 06 18:36:36 2011 +0000
@@ -412,7 +412,7 @@
          }
 
          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);
--- a/src/ui.cc	Thu Jan 06 17:37:40 2011 +0000
+++ b/src/ui.cc	Thu Jan 06 18:36:36 2011 +0000
@@ -705,7 +705,7 @@
    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;
--- a/src/uicmd.cc	Thu Jan 06 17:37:40 2011 +0000
+++ b/src/uicmd.cc	Thu Jan 06 18:36:36 2011 +0000
@@ -421,7 +421,6 @@
    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);