1 files changed, 10 insertions, 8 deletions

diff --git a/test/dw_ui_test.cc b/test/dw_ui_test.cc
index 2bc35893..60893f06 100644
--- a/test/dw_ui_test.cc
+++ b/test/dw_ui_test.cc
@@ -19,8 +19,8 @@
 
 
 
-#include <fltk/Window.h>
-#include <fltk/run.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
 
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
@@ -43,7 +43,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(400, 400, "Dw UI Test");
+   Fl_Window *window = new Fl_Window(400, 400, "Dw UI Test");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 400, 400);
@@ -61,7 +62,8 @@ int main(int argc, char **argv)
    fontAttrs.weight = 400;
    fontAttrs.style = FONT_STYLE_NORMAL;
    fontAttrs.letterSpacing = 0;
-   styleAttrs.font = Font::create (layout, &fontAttrs);
+   fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
+   styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
 
    Style *tableStyle = Style::create (layout, &styleAttrs);
 
@@ -119,7 +121,7 @@ int main(int argc, char **argv)
    const char *radiovalues[] = { "radio1", "radio2", NULL };
    form->addRadioButtonResource ("val3", radiores1, radiovalues);
    form->addCheckButtonResource ("check", checkres);
-   const char *selvalues[] = { "i1", "i11", "i12", "i13", "i2",
+   const char *selvalues[] = { "i1", "g1", "i11", "i12", "i13", "i2", "g2",
                                "i21", "i22", "i23", "i3", NULL };
    form->addSelectionResource ("val4", selres[0], selvalues);
    form->addSelectionResource ("val5", selres[1], selvalues);
@@ -207,9 +209,9 @@ int main(int argc, char **argv)
       selres[i]->addItem("item 1/3", false, false);
       selres[i]->popGroup();
 
-      selres[i]->addItem("item 2", true, i == 1);
+      selres[i]->addItem("item 2", false, i == 1);
 
-      selres[i]->pushGroup("group 2", false);
+      selres[i]->pushGroup("group 2", true);
       selres[i]->addItem("item 2/1", true, false);
       selres[i]->addItem("item 2/2", true, false);
       selres[i]->addItem("item 2/3", false, false);
@@ -232,7 +234,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete form;
    delete layout;