1 files changed, 12 insertions, 10 deletions
diff --git a/dw/fltkviewport.hh b/dw/fltkviewport.hh
index 1e7f54f6..3df1dccb 100644
--- a/dw/fltkviewport.hh
+++ b/dw/fltkviewport.hh
@@ -1,8 +1,8 @@
 #ifndef __DW_FLTKVIEWPORT_HH__
 #define __DW_FLTKVIEWPORT_HH__
 
-#include <fltk/Group.h>
-#include <fltk/Scrollbar.h>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Scrollbar.H>
 
 #include "core.hh"
 #include "fltkcore.hh"
@@ -21,12 +21,13 @@ private:
 
    int scrollX, scrollY;
    int scrollDX, scrollDY;
-   int dragScrolling, dragX, dragY;
+   int hasDragScroll, dragScrolling, dragX, dragY;
+   int horScrolling, verScrolling;
 
-   ::fltk::Scrollbar *vscrollbar, *hscrollbar;
+   Fl_Scrollbar *vscrollbar, *hscrollbar;
 
    GadgetOrientation gadgetOrientation[4];
-   lout::container::typed::List <lout::object::TypedPointer < ::fltk::Widget> >
+   lout::container::typed::List <lout::object::TypedPointer < Fl_Widget> >
       *gadgets;
 
    void adjustScrollbarsAndGadgetsAllocation ();
@@ -35,11 +36,11 @@ private:
    void vscrollbarChanged ();
    void positionChanged ();
 
-   static void hscrollbarCallback (Widget *hscrollbar, void *viewportPtr);
-   static void vscrollbarCallback (Widget *vscrollbar, void *viewportPtr);
+   static void hscrollbarCallback (Fl_Widget *hscrollbar, void *viewportPtr);
+   static void vscrollbarCallback (Fl_Widget *vscrollbar, void *viewportPtr);
 
    void updateCanvasWidgets (int oldScrollX, int oldScrollY);
-   static void draw_area (void *data, const Rectangle& cr);
+   static void draw_area (void *data, int x, int y, int w, int h);
 
 protected:
    int translateViewXToCanvasX (int x);
@@ -51,7 +52,7 @@ public:
    FltkViewport (int x, int y, int w, int h, const char *label = 0);
    ~FltkViewport ();
 
-   void layout();
+   void resize(int x, int y, int w, int h);
    void draw ();
    int handle (int event);
 
@@ -69,7 +70,8 @@ public:
 
    void setGadgetOrientation (bool hscrollbarVisible, bool vscrollbarVisible,
                               GadgetOrientation gadgetOrientation);
-   void addGadget (::fltk::Widget *gadget);
+   void setDragScroll (bool enable) { hasDragScroll = enable ? 1 : 0; }
+   void addGadget (Fl_Widget *gadget);
 };
 
 } // namespace fltk