diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2011-07-26 21:53:02 +0200 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2011-07-26 21:53:02 +0200 |
| commit | d2bccfee406c9b99dfd85269f14d93a3ef73da0b (patch) | |
| tree | 1d9784434792c0f079d7c6e063fab9f5ce47a1b8 /test/dw_border_test.cc | |
| parent | 604b03e2b43db99bfbadcf891f459b48dc39ff2a (diff) | |
| parent | 6b787a09569a823e8ebaae8025c33e4ead9e306e (diff) | |
merge port to fltk-1.3 (dillo_port1.3)
Diffstat (limited to 'test/dw_border_test.cc')
| -rw-r--r-- | test/dw_border_test.cc | 12 |
1 files changed, 7 insertions, 5 deletions
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(); |