a bit of fltkui

1 files changed, 30 insertions, 32 deletions

diff --git a/dw/fltkui.hh b/dw/fltkui.hh
index 245d5aad..1fdb142b 100644
--- a/dw/fltkui.hh
+++ b/dw/fltkui.hh
@@ -5,11 +5,9 @@
 #   error Do not include this file directly, use "fltkcore.hh" instead.
 #endif
 
-#include <fltk/Button.h>
-#include <fltk/Menu.h>
-#include <fltk/TextBuffer.h>
-#include <fltk/Item.h>
-#include <fltk/ItemGroup.h>
+#include <FL/Fl_Button.H>
+#include <FL/Fl_Menu.H>
+#include <FL/Fl_Text_Buffer.H>
 
 namespace dw {
 namespace fltk {
@@ -179,7 +177,7 @@ private:
 
 protected:
    FltkView *view;
-   ::fltk::Widget *widget;
+   Fl_Widget *widget;
    core::Allocation allocation;
    FltkPlatform *platform;
 
@@ -187,9 +185,9 @@ protected:
 
    FltkResource (FltkPlatform *platform);
    void init (FltkPlatform *platform);
-   virtual ::fltk::Widget *createNewWidget (core::Allocation *allocation) = 0;
+   virtual Fl_Widget *createNewWidget (core::Allocation *allocation) = 0;
 
-   void setWidgetStyle (::fltk::Widget *widget, core::style::Style *style);
+   void setWidgetStyle (Fl_Widget *widget, core::style::Style *style);
    void setDisplayed (bool displayed);
    bool displayed();
 public:
@@ -229,10 +227,10 @@ class FltkLabelButtonResource:
 private:
    const char *label;
 
-   static void widgetCallback (::fltk::Widget *widget, void *data);
+   static void widgetCallback (Fl_Widget *widget, void *data);
 
 protected:
-   ::fltk::Widget *createNewWidget (core::Allocation *allocation);
+   Fl_Widget *createNewWidget (core::Allocation *allocation);
 
 public:
    FltkLabelButtonResource (FltkPlatform *platform, const char *label);
@@ -251,7 +249,7 @@ class FltkComplexButtonResource:
 private:
    bool relief;
 
-   static void widgetCallback (::fltk::Widget *widget, void *data);
+   static void widgetCallback (Fl_Widget *widget, void *data);
 
 protected:
    FltkView *topView, *flatView;
@@ -267,7 +265,7 @@ protected:
    int reliefXThickness ();
    int reliefYThickness ();
 
-   ::fltk::Widget *createNewWidget (core::Allocation *allocation);
+   Fl_Widget *createNewWidget (core::Allocation *allocation);
 
 public:
    FltkComplexButtonResource (FltkPlatform *platform, dw::core::Widget *widget,
@@ -290,11 +288,11 @@ private:
    char *label;
    bool editable;
 
-   static void widgetCallback (::fltk::Widget *widget, void *data);
+   static void widgetCallback (Fl_Widget *widget, void *data);
    void setDisplayed (bool displayed);
 
 protected:
-   ::fltk::Widget *createNewWidget (core::Allocation *allocation);
+   Fl_Widget *createNewWidget (core::Allocation *allocation);
 
 public:
    FltkEntryResource (FltkPlatform *platform, int maxLength, bool password,
@@ -314,12 +312,12 @@ class FltkMultiLineTextResource:
    public FltkSpecificResource <dw::core::ui::MultiLineTextResource>
 {
 private:
-   ::fltk::TextBuffer *buffer;
+   Fl_Text_Buffer *buffer;
    bool editable;
    int numCols, numRows;
 
 protected:
-   ::fltk::Widget *createNewWidget (core::Allocation *allocation);
+   Fl_Widget *createNewWidget (core::Allocation *allocation);
 
 public:
    FltkMultiLineTextResource (FltkPlatform *platform, int cols, int rows);
@@ -341,8 +339,8 @@ private:
    bool initActivated;
 
 protected:
-   virtual ::fltk::Button *createNewButton (core::Allocation *allocation) = 0;
-   ::fltk::Widget *createNewWidget (core::Allocation *allocation);
+   virtual Fl_Button *createNewButton (core::Allocation *allocation) = 0;
+   Fl_Widget *createNewWidget (core::Allocation *allocation);
 
 public:
    FltkToggleButtonResource (FltkPlatform *platform,
@@ -360,7 +358,7 @@ class FltkCheckButtonResource:
    public FltkToggleButtonResource <dw::core::ui::CheckButtonResource>
 {
 protected:
-   ::fltk::Button *createNewButton (core::Allocation *allocation);
+   Fl_Button *createNewButton (core::Allocation *allocation);
 
 public:
    FltkCheckButtonResource (FltkPlatform *platform,
@@ -418,11 +416,11 @@ private:
 
    Group *group;
 
-   static void widgetCallback (::fltk::Widget *widget, void *data);
+   static void widgetCallback (Fl_Widget *widget, void *data);
    void buttonClicked ();
 
 protected:
-   ::fltk::Button *createNewButton (core::Allocation *allocation);
+   Fl_Button *createNewButton (core::Allocation *allocation);
 
 public:
    FltkRadioButtonResource (FltkPlatform *platform,
@@ -450,17 +448,17 @@ protected:
             bool selected = false);
       ~Item ();
 
-      ::fltk::Item *createNewWidget (int index);
-      ::fltk::ItemGroup *createNewGroupWidget ();
+      Item *createNewWidget (int index);
+      Fl_ItemGroup *createNewGroupWidget ();
    };
 
    class WidgetStack: public lout::object::Object
    {
    public:
-      ::fltk::Menu *widget;
-      lout::container::typed::Stack <lout::object::TypedPointer < ::fltk::Menu> > *stack;
+      Fl_Menu *widget;
+      lout::container::typed::Stack <lout::object::TypedPointer < Fl_Menu> > *stack;
 
-      WidgetStack (::fltk::Menu *widget);
+      WidgetStack (Fl_Menu *widget);
       ~WidgetStack ();
    };
 
@@ -473,8 +471,8 @@ protected:
                         bool enabled = true,
                         bool selected = false);
 
-   ::fltk::Widget *createNewWidget (core::Allocation *allocation);
-   virtual ::fltk::Menu *createNewMenu (core::Allocation *allocation) = 0;
+   Fl_Widget *createNewWidget (core::Allocation *allocation);
+   virtual Fl_Menu *createNewMenu (core::Allocation *allocation) = 0;
    virtual bool setSelectedItems() { return false; }
 
    int getMaxStringWidth ();
@@ -499,11 +497,11 @@ class FltkOptionMenuResource:
    public FltkSelectionResource <dw::core::ui::OptionMenuResource>
 {
 protected:
-   ::fltk::Menu *createNewMenu (core::Allocation *allocation);
+   Fl_Menu *createNewMenu (core::Allocation *allocation);
    virtual bool setSelectedItems() { return true; }
 
 private:
-   static void widgetCallback (::fltk::Widget *widget, void *data);
+   static void widgetCallback (Fl_Widget *widget, void *data);
    int selection;
 
 public:
@@ -520,10 +518,10 @@ class FltkListResource:
    public FltkSelectionResource <dw::core::ui::ListResource>
 {
 protected:
-   ::fltk::Menu *createNewMenu (core::Allocation *allocation);
+   Fl_Menu *createNewMenu (core::Allocation *allocation);
 
 private:
-   static void widgetCallback (::fltk::Widget *widget, void *data);
+   static void widgetCallback (Fl_Widget *widget, void *data);
    lout::misc::SimpleVector <bool> itemsSelected;
    int showRows;
    ListResource::SelectionMode mode;