1 files changed, 16 insertions, 16 deletions

diff --git a/test/dw_find_test.cc b/test/dw_find_test.cc
index a0743754..f360403a 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,21 @@ 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->begin();
 
    viewport = new FltkViewport (0, 0, 200, 280);
    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);
 
-   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);
 
-   resultLabel = new ::fltk::Widget(100, 280, 100, 20, "---");
+   resultLabel = new Fl_Box(100, 280, 100, 20, "---");
 
    FontAttrs fontAttrs;
    fontAttrs.name = "Bitstream Charter";
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 
    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 +143,7 @@ int main(int argc, char **argv)
 
    window->resizable(viewport);
    window->show();
-   int errorCode = ::fltk::run();
+   int errorCode = Fl::run();
 
    delete layout;