merge port to fltk-1.3 (dillo_port1.3)

17 files changed, 167 insertions, 140 deletions

diff --git a/test/dw_anchors_test.cc b/test/dw_anchors_test.cc
index 69122c4a..10525f1a 100644
--- a/test/dw_anchors_test.cc
+++ b/test/dw_anchors_test.cc
@@ -20,8 +20,8 @@
 
 
 #include <ctype.h>
-#include <fltk/Window.h>
-#include <fltk/run.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl.H>
 
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
@@ -36,7 +36,7 @@ using namespace dw::fltk;
 
 static FltkPlatform *platform;
 static Layout *layout;
-static ::fltk::Window *window;
+static Fl_Window *window;
 static FltkViewport *viewport;
 static Style *topWidgetStyle, *widgetStyle, *wordStyle, *headingStyle;
 static Textblock *topTextblock = NULL;
@@ -47,7 +47,7 @@ static const char *numbers[10] = {
    "six", "seven", "eight", "nine", "ten"
 };
 
-static void anchorCallback (::fltk::Widget *widget, void *data)
+static void anchorCallback (Fl_Widget *widget, void *data)
 {
    layout->setAnchor (numbers[(long)data]);
 }
@@ -87,7 +87,7 @@ static void textTimeout (void *data)
 
    textblockNo++;
    if (textblockNo < 10)
-      ::fltk::repeat_timeout (1, textTimeout, NULL);
+      Fl::repeat_timeout (1, textTimeout, NULL);
 
 }
 
@@ -98,10 +98,12 @@ int main(int argc, char **argv)
    platform = new FltkPlatform ();
    layout = new Layout (platform);
 
-   window = new ::fltk::Window(250, 200, "Dw Anchors Test");
+   window = new Fl_Window(250, 200, "Dw Anchors Test");
+   window->box(FL_NO_BOX);
    window->begin();
 
    viewport = new FltkViewport (50, 0, 200, 200);
+   viewport->end();
    layout->attachView (viewport);
 
    for (int i = 0; i < 10; i++) {
@@ -109,10 +111,9 @@ int main(int argc, char **argv)
       strcpy (buf, numbers[i]);
       buf[0] = toupper (buf[0]);
       buttonLabel[i] = strdup(buf);
-      ::fltk::Button *button =
-           new ::fltk::Button(0, 20 * i, 50, 20, buttonLabel[i]);
+      Fl_Button *button = new Fl_Button(0, 20 * i, 50, 20, buttonLabel[i]);
       button->callback (anchorCallback, (void*)(long)i);
-      button->when (::fltk::WHEN_RELEASE);
+      button->when (FL_WHEN_RELEASE);
    }
 
    FontAttrs fontAttrs;
@@ -121,10 +122,11 @@ int main(int argc, char **argv)
    fontAttrs.weight = 400;
    fontAttrs.style = FONT_STYLE_NORMAL;
    fontAttrs.letterSpacing = 0;
+   fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
 
    StyleAttrs styleAttrs;
    styleAttrs.initValues ();
-   styleAttrs.font = Font::create (layout, &fontAttrs);
+   styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
    styleAttrs.margin.setVal (5);
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -140,22 +142,22 @@ int main(int argc, char **argv)
 
    fontAttrs.size = 28;
    fontAttrs.weight = 700;
-   styleAttrs.font = Font::create (layout, &fontAttrs);
+   styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
    headingStyle = Style::create (layout, &styleAttrs);
 
-   ::fltk::add_timeout (0, textTimeout, NULL);
+   Fl::add_timeout (0, textTimeout, NULL);
 
    window->resizable(viewport);
    window->show();
 
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    topWidgetStyle->unref ();
    widgetStyle->unref ();
    wordStyle->unref ();
    headingStyle->unref ();
    for (int i = 0; i < 10; i++)
-      delete buttonLabel[i];
+      free(buttonLabel[i]);
    delete layout;
 
    return errorCode;
diff --git a/test/dw_border_test.cc b/test/dw_border_test.cc
index b7586608..988abc33 100644
--- a/test/dw_border_test.cc
+++ b/test/dw_border_test.cc
@@ -19,8 +19,8 @@
 
 
 
-#include <fltk/Window.h>
-#include <fltk/run.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl.H>
 
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
@@ -38,7 +38,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Border Test");
+   Fl_Window *window = new Fl_Window(200, 300, "Dw Border Test");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 200, 300);
@@ -58,7 +59,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -115,7 +117,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    widgetStyle2->unref();
    wordStyle->unref();
diff --git a/test/dw_example.cc b/test/dw_example.cc
index 1ce643f8..52aa2440 100644
--- a/test/dw_example.cc
+++ b/test/dw_example.cc
@@ -19,8 +19,8 @@
 
 
 
-#include <fltk/Window.h>
-#include <fltk/run.h>
+#include <FL/Fl_Window.H>
+#include <FL/Fl.H>
 
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
@@ -33,7 +33,8 @@ int main(int argc, char **argv)
    dw::fltk::FltkPlatform *platform = new dw::fltk::FltkPlatform ();
    dw::core::Layout *layout = new dw::core::Layout (platform);
 
-   fltk::Window *window = new fltk::Window(200, 300, "Dw Example");
+   Fl_Window *window = new Fl_Window(200, 300, "Dw Example");
+   window->box(FL_NO_BOX);
    window->begin();
 
    dw::fltk::FltkViewport *viewport =
@@ -50,6 +51,7 @@ int main(int argc, char **argv)
    fontAttrs.weight = 400;
    fontAttrs.style = dw::core::style::FONT_STYLE_NORMAL;
    fontAttrs.letterSpacing = 0;
+   fontAttrs.fontVariant = dw::core::style::FONT_VARIANT_NORMAL;
    styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
 
    styleAttrs.color =
@@ -95,7 +97,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_find_test.cc b/test/dw_find_test.cc
index a0743754..e5c79fd3 100644
--- a/test/dw_find_test.cc
+++ b/test/dw_find_test.cc
@@ -19,9 +19,9 @@
 
 
 
-#include <fltk/Window.h>
-#include <fltk/run.h>
-
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Box.H>
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
 #include "../dw/fltkviewport.hh"
@@ -35,12 +35,12 @@ using namespace dw::fltk;
 
 static FltkPlatform *platform;
 static Layout *layout;
-static ::fltk::Window *window;
+static Fl_Window *window;
 static FltkViewport *viewport;
-static ::fltk::Button *findButton, *resetButton;
-static ::fltk::Widget *resultLabel;
+static Fl_Button *findButton, *resetButton;
+static Fl_Widget *resultLabel;
 
-static void findCallback (::fltk::Widget *widget, void *data)
+static void findCallback (Fl_Widget *widget, void *data)
 {
    //switch(layout->search ("worm", true)) {
    switch(layout->search ("WORM", false, false)) {
@@ -60,7 +60,7 @@ static void findCallback (::fltk::Widget *widget, void *data)
    resultLabel->redraw ();
 }
 
-static void resetCallback (::fltk::Widget *widget, void *data)
+static void resetCallback (Fl_Widget *widget, void *data)
 {
    layout->resetSearch ();
    resultLabel->label("---");
@@ -72,21 +72,26 @@ int main(int argc, char **argv)
    platform = new FltkPlatform ();
    layout = new Layout (platform);
 
-   window = new ::fltk::Window(200, 300, "Dw Find Test");
+   window = new Fl_Window(200, 300, "Dw Find Test");
+   window->box(FL_NO_BOX);
    window->begin();
 
    viewport = new FltkViewport (0, 0, 200, 280);
+   viewport->end();
    layout->attachView (viewport);
 
-   findButton = new ::fltk::Button(0, 280, 50, 20, "Find");
+   findButton = new Fl_Button(0, 280, 50, 20, "Find");
    findButton->callback (findCallback, NULL);
-   findButton->when (::fltk::WHEN_RELEASE);
+   findButton->when (FL_WHEN_RELEASE);
+   findButton->clear_visible_focus ();
 
-   resetButton = new ::fltk::Button(50, 280, 50, 20, "Reset");
+   resetButton = new Fl_Button(50, 280, 50, 20, "Reset");
    resetButton->callback (resetCallback, NULL);
-   resetButton->when (::fltk::WHEN_RELEASE);
+   resetButton->when (FL_WHEN_RELEASE);
+   resetButton->clear_visible_focus ();
 
-   resultLabel = new ::fltk::Widget(100, 280, 100, 20, "---");
+   resultLabel = new Fl_Box(100, 280, 100, 20, "---");
+   resultLabel->box(FL_FLAT_BOX);
 
    FontAttrs fontAttrs;
    fontAttrs.name = "Bitstream Charter";
@@ -94,10 +99,11 @@ int main(int argc, char **argv)
    fontAttrs.weight = 400;
    fontAttrs.style = FONT_STYLE_NORMAL;
    fontAttrs.letterSpacing = 0;
+   fontAttrs.fontVariant = FONT_VARIANT_NORMAL;
 
    StyleAttrs styleAttrs;
    styleAttrs.initValues ();
-   styleAttrs.font = Font::create (layout, &fontAttrs);
+   styleAttrs.font = dw::core::style::Font::create (layout, &fontAttrs);
    styleAttrs.margin.setVal (10);
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -143,7 +149,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_images_scaled.cc b/test/dw_images_scaled.cc
index c9f6e76e..2f8896e6 100644
--- a/test/dw_images_scaled.cc
+++ b/test/dw_images_scaled.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"
@@ -87,7 +87,7 @@ static void imageDrawTimeout (void *data)
    }
 
    if(imgRow < 200)
-      ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL);
+      Fl::repeat_timeout (0.5, imageDrawTimeout, NULL);
 }
 
 int main(int argc, char **argv)
@@ -95,7 +95,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(410, 210, "Dw Scaled Image");
+   Fl_Window *window = new Fl_Window(410, 210, "Dw Scaled Image");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 410, 210);
@@ -113,7 +114,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -142,10 +144,10 @@ int main(int argc, char **argv)
    window->resizable(viewport);
    window->show();
 
-   ::fltk::add_timeout (2.0, imageInitTimeout, NULL);
-   ::fltk::add_timeout (0.1, imageDrawTimeout, NULL);
+   Fl::add_timeout (2.0, imageInitTimeout, NULL);
+   Fl::add_timeout (0.1, imageDrawTimeout, NULL);
 
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_images_scaled2.cc b/test/dw_images_scaled2.cc
index 175ef414..b436ec94 100644
--- a/test/dw_images_scaled2.cc
+++ b/test/dw_images_scaled2.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"
@@ -64,7 +64,7 @@ static void imageDrawTimeout (void *data)
    }
 
    if(imgRow < 200)
-      ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL);
+      Fl::repeat_timeout (0.5, imageDrawTimeout, NULL);
 }
 
 int main(int argc, char **argv)
@@ -72,7 +72,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(410, 210, "Dw Scaled Image 2");
+   Fl_Window *window = new Fl_Window(410, 210, "Dw Scaled Image 2");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 410, 210);
@@ -88,7 +89,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -137,10 +139,10 @@ int main(int argc, char **argv)
    window->resizable(viewport);
    window->show();
 
-   ::fltk::add_timeout (3.0, imageInitTimeout, NULL);
-   ::fltk::add_timeout (0.1, imageDrawTimeout, NULL);
+   Fl::add_timeout (3.0, imageInitTimeout, NULL);
+   Fl::add_timeout (0.1, imageDrawTimeout, NULL);
 
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_images_simple.cc b/test/dw_images_simple.cc
index 39b7ed90..8f00f847 100644
--- a/test/dw_images_simple.cc
+++ b/test/dw_images_simple.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"
@@ -66,7 +66,7 @@ static void imageDrawTimeout (void *data)
    }
 
    if(imgRow < 200)
-      ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL);
+      Fl::repeat_timeout (0.5, imageDrawTimeout, NULL);
 }
 */
 
@@ -88,7 +88,7 @@ static void imageDrawTimeout (void *data)
    }
 
    if(imgRow < 200)
-      ::fltk::repeat_timeout (0.5, imageDrawTimeout, NULL);
+      Fl::repeat_timeout (0.5, imageDrawTimeout, NULL);
 }
 
 int main(int argc, char **argv)
@@ -96,7 +96,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(410, 210, "Dw Simple Image");
+   Fl_Window *window = new Fl_Window(410, 210, "Dw Simple Image");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 410, 210);
@@ -112,7 +113,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -141,10 +143,10 @@ int main(int argc, char **argv)
    window->resizable(viewport);
    window->show();
 
-   ::fltk::add_timeout (2.0, imageInitTimeout, NULL);
-   ::fltk::add_timeout (0.1, imageDrawTimeout, NULL);
+   Fl::add_timeout (2.0, imageInitTimeout, NULL);
+   Fl::add_timeout (0.1, imageDrawTimeout, NULL);
 
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_imgbuf_mem_test.cc b/test/dw_imgbuf_mem_test.cc
index 33131134..45beef8b 100644
--- a/test/dw_imgbuf_mem_test.cc
+++ b/test/dw_imgbuf_mem_test.cc
@@ -17,11 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#include <fltk/Window.h>
-#include <fltk/run.h>
-
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
 
diff --git a/test/dw_links.cc b/test/dw_links.cc
index 44628b28..5622cbd5 100644
--- a/test/dw_links.cc
+++ b/test/dw_links.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"
@@ -76,7 +76,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Links");
+   Fl_Window *window = new Fl_Window(200, 300, "Dw Links");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 200, 300);
@@ -92,7 +93,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -153,7 +155,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_links2.cc b/test/dw_links2.cc
index 294950af..b8e8c55b 100644
--- a/test/dw_links2.cc
+++ b/test/dw_links2.cc
@@ -19,8 +19,9 @@
 
 
 
-#include <fltk/Window.h>
-#include <fltk/run.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Box.H>
 
 #include "../dw/core.hh"
 #include "../dw/fltkcore.hh"
@@ -78,22 +79,23 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Links2");
+   Fl_Window *window = new Fl_Window(200, 300, "Dw Links2");
+   window->box(FL_NO_BOX);
    window->begin();
-    ::fltk::Widget *Panel = new ::fltk::Widget(0, 0, ww, lh, "CONTROL PANEL");
-
-    Panel->color(::fltk::GRAY15);
-    Panel->labelcolor(::fltk::WHITE);
-    ::fltk::Widget *Main =
-       new ::fltk::Widget(0, lh, ww, wh - 2*lh, "MAIN RENDERING AREA");
-    Main->color(::fltk::GRAY20);
-    Main->labelcolor(::fltk::WHITE);
+    Fl_Widget *Panel = new Fl_Box(0, 0, ww, lh, "CONTROL PANEL");
+
+    Panel->color(FL_GRAY_RAMP + 3);
+    Panel->labelcolor(FL_WHITE);
+    Panel->box(FL_FLAT_BOX);
+    Fl_Widget *Main = new Fl_Box(0, lh, ww, wh - 2*lh, "MAIN RENDERING AREA");
+    Main->color(FL_GRAY_RAMP + 4);
+    Main->labelcolor(FL_WHITE);
     MainIdx = window->find(Main);
     /* status bar */
-    ::fltk::Widget *Bar =
-       new ::fltk::Widget(0, wh - lh, 200, lh, "STATUS BAR...");
-    Bar->color(::fltk::GRAY15);
-    Bar->labelcolor(::fltk::WHITE);
+    Fl_Widget *Bar = new Fl_Box(0, wh - lh, 200, lh, "STATUS BAR...");
+    Bar->color(FL_GRAY_RAMP + 3);
+    Bar->labelcolor(FL_WHITE);
+    Bar->box(FL_FLAT_BOX);
 
     window->resizable(Main);
    window->end();
@@ -120,7 +122,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -181,7 +184,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_lists.cc b/test/dw_lists.cc
index 2725c34d..12fa1627 100644
--- a/test/dw_lists.cc
+++ b/test/dw_lists.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"
@@ -38,7 +38,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Lists");
+   Fl_Window *window = new Fl_Window(200, 300, "Dw Lists");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 200, 300);
@@ -54,7 +55,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -126,7 +128,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_resource_test.cc b/test/dw_resource_test.cc
index 28611bb0..a2a26c62 100644
--- a/test/dw_resource_test.cc
+++ b/test/dw_resource_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"
@@ -39,7 +39,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(410, 210, "Dw Resource test");
+   Fl_Window *window = new Fl_Window(410, 210, "Dw Resource test");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 410, 210);
@@ -55,7 +56,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xffffff);
@@ -71,6 +73,8 @@ int main(int argc, char **argv)
    styleAttrs.margin.setVal (0);
    styleAttrs.backgroundColor = NULL;
 
+   widgetStyle = Style::create (layout, &styleAttrs);
+
    SelectionResource *res = layout->getResourceFactory()->createListResource
       (ListResource::SELECTION_AT_MOST_ONE, 4);
    //SelectionResource *res =
@@ -83,14 +87,14 @@ int main(int argc, char **argv)
    widgetStyle->unref();
 
    for(int i = 0; i < 50; i++)
-      res->addItem ("Hello, world!", true, false);
+      res->addItem ("Hello, world!", true, i == 0 ? true : false);
 
    textblock->flush ();
 
    window->resizable(viewport);
    window->show();
 
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_table.cc b/test/dw_table.cc
index b0e9c4db..75842e60 100644
--- a/test/dw_table.cc
+++ b/test/dw_table.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"
@@ -38,7 +38,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(300, 300, "Dw Table");
+   Fl_Window *window = new Fl_Window(300, 300, "Dw Table");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 300, 300);
@@ -62,7 +63,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);
 
@@ -107,7 +109,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
diff --git a/test/dw_table_aligned.cc b/test/dw_table_aligned.cc
index 67cf21f3..022e7026 100644
--- a/test/dw_table_aligned.cc
+++ b/test/dw_table_aligned.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"
@@ -38,7 +38,8 @@ int main(int argc, char **argv)
    FltkPlatform *platform = new FltkPlatform ();
    Layout *layout = new Layout (platform);
 
-   ::fltk::Window *window = new ::fltk::Window(200, 300, "Dw Table Aligned");
+   Fl_Window *window = new Fl_Window(200, 300, "Dw Table Aligned");
+   window->box(FL_NO_BOX);
    window->begin();
 
    FltkViewport *viewport = new FltkViewport (0, 0, 200, 300);
@@ -57,7 +58,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);
 
    styleAttrs.color = Color::create (layout, 0x000000);
    styleAttrs.backgroundColor = Color::create (layout, 0xa0a0a0);
@@ -111,7 +113,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;
 
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;
diff --git a/test/fltk_browser.cc b/test/fltk_browser.cc
index 11dfcbeb..bdbec72c 100644
--- a/test/fltk_browser.cc
+++ b/test/fltk_browser.cc
@@ -19,28 +19,25 @@
 
 
 
-#include <fltk/Window.h>
-#include <fltk/Browser.h>
-#include <fltk/MultiBrowser.h>
-#include <fltk/Item.h>
-#include <fltk/run.h>
-
-using namespace fltk;
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Multi_Browser.H>
+#include <FL/Fl.H>
 
 int main (int argc, char *argv[])
 {
-   Window *window = new Window (300, 300, "FLTK Browser");
+   Fl_Window *window = new Fl_Window (300, 300, "FLTK Browser");
+   window->box(FL_NO_BOX);
    window->begin ();
-   Browser *browser = new MultiBrowser (0, 0, 300, 300);
+   Fl_Multi_Browser *browser = new Fl_Multi_Browser (0, 0, 300, 300);
    browser->begin ();
 
    for (int i = 0; i < 10; i++) {
-      new Item ("first");
-      new Item ("second");
-      new Item ("third");
+      browser->add("first");
+      browser->add("second");
+      browser->add("third");
    }
 
    window->resizable(browser);
    window->show();
-   return run();
+   return Fl::run();
 }
diff --git a/test/form.cc b/test/form.cc
index 4bebd520..82938a16 100644
--- a/test/form.cc
+++ b/test/form.cc
@@ -32,7 +32,7 @@ Form::ResourceDecorator::ResourceDecorator (const char *name)
 
 Form::ResourceDecorator::~ResourceDecorator ()
 {
-   delete name;
+   free((char *)name);
 }
 
 Form::TextResourceDecorator::TextResourceDecorator (const char *name,
@@ -57,15 +57,15 @@ Form::RadioButtonResourceDecorator::RadioButtonResourceDecorator
    while (values[n])
       n++;
    this->values = new const char*[n + 1];
-   for(int i = 0; i < n; i++)
+   for (int i = 0; i < n; i++)
       this->values[i] = strdup (values[i]);
    this->values[n] = 0;
 }
 
 Form::RadioButtonResourceDecorator::~RadioButtonResourceDecorator ()
 {
-   for(int i = 0; values[i]; i++)
-      delete values[i];
+   for (int i = 0; values[i]; i++)
+      free((char *)values[i]);
    delete[] values;
 }
 
@@ -115,7 +115,7 @@ Form::SelectionResourceDecorator::SelectionResourceDecorator
 Form::SelectionResourceDecorator::~SelectionResourceDecorator ()
 {
    for(int i = 0; values[i]; i++)
-      delete values[i];
+      free((char *)values[i]);
    delete[] values;
 }
 
@@ -159,8 +159,8 @@ Form::FormClickedReceiver::FormClickedReceiver (Form *form, const char *name,
 
 Form::FormClickedReceiver::~FormClickedReceiver ()
 {
-   delete name;
-   delete[] value;
+   free((char *)name);
+   free((char *)value);
 }
 
 void Form::FormClickedReceiver::clicked (Resource *resource,