1 files changed, 30 insertions, 26 deletions

diff --git a/dw/fltkpreview.cc b/dw/fltkpreview.cc
index 7096420f..ecb96f22 100644
--- a/dw/fltkpreview.cc
+++ b/dw/fltkpreview.cc
@@ -22,15 +22,13 @@
 #include "fltkpreview.hh"
 #include "fltkmisc.hh"
 
-#include <fltk/events.h>
-#include <fltk/xbmImage.h>
-#include <fltk/draw.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Bitmap.H>
+#include <FL/fl_draw.H>
 #include <stdio.h>
 
 #include "preview.xbm"
 
-using namespace ::fltk;
-
 namespace dw {
 namespace fltk {
 
@@ -126,7 +124,7 @@ void FltkPreview::drawText (core::style::Font *font,
     * else that measures text).
     */
    FltkFont *ff = (FltkFont*)font;
-   setfont(ff->font, translateCanvasXToViewX (ff->size));
+   Fl::set_font(ff->font, translateCanvasXToViewX (ff->size));
 #if 0
    /**
     * \todo Normally, this should already be known, maybe it
@@ -144,9 +142,16 @@ void FltkPreview::drawText (core::style::Font *font,
    setcolor(((FltkColor*)color)->colors[shading]);
    fillrect (rect);
 #endif
-   setcolor(((FltkColor*)color)->colors[shading]);
-   drawtext(text, len,
-            translateCanvasXToViewX (x), translateCanvasYToViewY (y));
+   fl_color(((FltkColor*)color)->colors[shading]);
+   fl_draw(text, len, translateCanvasXToViewX (x), translateCanvasYToViewY(y));
+}
+
+void FltkPreview::drawSimpleWrappedText (core::style::Font *font,
+                                         core::style::Color *color,
+                                         core::style::Color::Shading shading,
+                                         int x, int y, int w, int h,
+                                         const char *text)
+{
 }
 
 void FltkPreview::drawImage (core::Imgbuf *imgbuf, int xRoot, int yRoot,
@@ -159,7 +164,7 @@ bool FltkPreview::usesFltkWidgets ()
    return false;
 }
 
-void FltkPreview::drawFltkWidget (::fltk::Widget *widget,
+void FltkPreview::drawFltkWidget (Fl_Widget *widget,
                                   core::Rectangle *area)
 {
 }
@@ -167,9 +172,9 @@ void FltkPreview::drawFltkWidget (::fltk::Widget *widget,
 // ----------------------------------------------------------------------
 
 FltkPreviewWindow::FltkPreviewWindow (dw::core::Layout *layout):
-   MenuWindow (1, 1)
+   Fl_Menu_Window (1, 1)
 {
-   box (EMBOSSED_BOX);
+   box (FL_EMBOSSED_BOX);
 
    begin ();
    preview = new FltkPreview (BORDER_WIDTH, BORDER_WIDTH, 1, 1, layout);
@@ -205,7 +210,7 @@ void FltkPreviewWindow::reallocate ()
       height = preview->canvasHeight * maxWidth / preview->canvasWidth;
    }
 
-   get_mouse(mx, my);
+   Fl::get_mouse(mx, my);
 
    posX = mx - preview->translateCanvasXToViewX (preview->scrollX
                                                  + preview->scrollWidth / 2);
@@ -237,13 +242,12 @@ void FltkPreviewWindow::reallocate ()
 
    resize (posX, posY, width, height);
 
-   preview->w (w () - 2 * BORDER_WIDTH);
-   preview->h (h () - 2 * BORDER_WIDTH);
+   preview->size(w () - 2 * BORDER_WIDTH, h () - 2 * BORDER_WIDTH);
 }
 
 void FltkPreviewWindow::hideWindow ()
 {
-   Window::hide ();
+   Fl_Window::hide ();
 }
 
 void FltkPreviewWindow::scrollTo (int mouseX, int mouseY)
@@ -263,9 +267,9 @@ void FltkPreviewWindow::scrollTo (int mouseX, int mouseY)
 FltkPreviewButton::FltkPreviewButton (int x, int y, int w, int h,
                                       dw::core::Layout *layout,
                                       const char *label):
-   Button (x, y, w, h, label)
+   Fl_Button (x, y, w, h, label)
 {
-   image (new xbmImage (preview_bits, preview_width, preview_height));
+   image (new Fl_Bitmap (preview_bits, preview_width, preview_height));
    window = new FltkPreviewWindow (layout);
 }
 
@@ -278,23 +282,23 @@ int FltkPreviewButton::handle (int event)
    /** \bug Some parts are missing. */
 
    switch (event) {
-   case PUSH:
+   case FL_PUSH:
       window->showWindow ();
-      return Button::handle (event);
+      return Fl_Button::handle (event);
 
-   case DRAG:
+   case FL_DRAG:
       if (window->visible ()) {
-         window->scrollTo (event_x_root (), event_y_root ());
+         window->scrollTo (Fl::event_x_root (), Fl::event_y_root ());
          return 1;
       }
-      return Button::handle (event);
+      return Fl_Button::handle (event);
 
-   case RELEASE:
+   case FL_RELEASE:
       window->hideWindow ();
-      return Button::handle (event);
+      return Fl_Button::handle (event);
 
    default:
-      return Button::handle (event);
+      return Fl_Button::handle (event);
    }
 }