- Set the ::fltk::RAW_LABEL flag for widgets getting labels from html.

2 files changed, 10 insertions, 1 deletions

diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index 70ba1ef3..4b84fe03 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -262,6 +262,7 @@ FltkLabelButtonResource::~FltkLabelButtonResource ()
         new ::fltk::Button (allocation->x, allocation->y, allocation->width,
                             allocation->ascent + allocation->descent,
                             label);
+   button->set_flag (::fltk::RAW_LABEL);
    button->callback (widgetCallback, this);
    button->when (::fltk::WHEN_RELEASE);
    return button;
@@ -727,9 +728,11 @@ FltkCheckButtonResource::~FltkCheckButtonResource ()
 ::fltk::Button *FltkCheckButtonResource::createNewButton (core::Allocation
                                                           *allocation)   
 {
-   return
+   ::fltk::CheckButton *cb =
       new ::fltk::CheckButton (allocation->x, allocation->y, allocation->width,
                                allocation->ascent + allocation->descent);
+   cb->set_flag (::fltk::RAW_LABEL);
+   return cb;
 }
 
 // ----------------------------------------------------------------------
@@ -841,6 +844,7 @@ void FltkRadioButtonResource::buttonClicked ()
       new ::fltk::RadioButton (allocation->x, allocation->y,
                                allocation->width,
                                allocation->ascent + allocation->descent);
+   button->set_flag (::fltk::RAW_LABEL);
    button->when (::fltk::WHEN_CHANGED);
    button->callback (widgetCallback, this);
    button->type (::fltk::Button::TOGGLE);
@@ -871,6 +875,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->user_data ((void *) index);
    return item;
 }
@@ -880,6 +885,7 @@ template <class I>
 FltkSelectionResource<I>::Item::createNewGroupWidget ()
 {
    ::fltk::ItemGroup *itemGroup = new ::fltk::ItemGroup (name);
+   itemGroup->set_flag (::fltk::RAW_LABEL);
    itemGroup->user_data ((void *) -1L);
    return itemGroup;
 }
@@ -1080,6 +1086,7 @@ FltkOptionMenuResource::~FltkOptionMenuResource ()
       new ::fltk::Choice (allocation->x, allocation->y,
                           allocation->width,
                           allocation->ascent + allocation->descent);
+   menu->set_flag (::fltk::RAW_LABEL);
    menu->callback(widgetCallback,this);
    return menu;
 }
@@ -1147,6 +1154,7 @@ FltkListResource::~FltkListResource ()
       new ::fltk::MultiBrowser (allocation->x, allocation->y,
                                 allocation->width,
                                 allocation->ascent + allocation->descent);
+   menu->set_flag (::fltk::RAW_LABEL);
    menu->callback(widgetCallback,this);
    menu->when(::fltk::WHEN_CHANGED);
    return menu;
diff --git a/src/uicmd.cc b/src/uicmd.cc
index ef1d19ff..83987725 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -128,6 +128,7 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *vbw)
    Window *win = new Window(ww, wh);
    win->shortcut(0); // Ignore Escape
    win->clear_double_buffer();
+   win->set_flag(RAW_LABEL);
    CustTabGroup *DilloTabs = new CustTabGroup(0, 0, ww, wh);
    DilloTabs->selection_color(156);
    win->add(DilloTabs);