fltkhs 0.5.1.1 → 0.5.1.2

raw patch · 121 files changed

+9482/−1195 lines, 121 filesPVP: minor bump suggested

API additions: PVP suggests at least a minor version bump

API changes (from Hackage documentation)

Files

• c-src/DerivedText_Editor.cpp +85/−11
• c-src/DerivedText_Editor.h +18/−4
• c-src/Fl_AdjusterC.cpp +125/−19
• c-src/Fl_AdjusterC.h +34/−3
• c-src/Fl_CallbackC.h +1/−0
• c-src/Fl_Check_ButtonC.cpp +124/−11
• c-src/Fl_Check_ButtonC.h +33/−1
• c-src/Fl_ChoiceC.cpp +118/−23
• c-src/Fl_ChoiceC.h +38/−11
• c-src/Fl_ClockC.cpp +123/−12
• c-src/Fl_ClockC.h +33/−1
• c-src/Fl_Color_ChooserC.cpp +234/−121
• c-src/Fl_Color_ChooserC.h +36/−0
• c-src/Fl_CounterC.cpp +125/−22
• c-src/Fl_CounterC.h +32/−0
• c-src/Fl_DialC.cpp +122/−21
• c-src/Fl_DialC.h +31/−0
• c-src/Fl_File_BrowserC.cpp +105/−27
• c-src/Fl_File_BrowserC.h +32/−8
• c-src/Fl_File_InputC.cpp +121/−14
• c-src/Fl_File_InputC.h +31/−2
• c-src/Fl_GroupC.cpp +118/−6
• c-src/Fl_GroupC.h +30/−9
• c-src/Fl_InputC.cpp +122/−14
• c-src/Fl_InputC.h +34/−3
• c-src/Fl_Light_ButtonC.cpp +123/−11
• c-src/Fl_Light_ButtonC.h +32/−0
• c-src/Fl_Menu_BarC.cpp +121/−9
• c-src/Fl_Menu_BarC.h +31/−0
• c-src/Fl_Menu_ButtonC.cpp +120/−17
• c-src/Fl_Menu_ButtonC.h +31/−0
• c-src/Fl_OutputC.cpp +124/−15
• c-src/Fl_OutputC.h +35/−3
• c-src/Fl_PackC.cpp +123/−9
• c-src/Fl_PackC.h +31/−0
• c-src/Fl_PositionerC.cpp +118/−17
• c-src/Fl_PositionerC.h +31/−4
• c-src/Fl_ProgressC.cpp +121/−17
• c-src/Fl_ProgressC.h +32/−0
• c-src/Fl_Repeat_ButtonC.cpp +123/−11
• c-src/Fl_Repeat_ButtonC.h +31/−0
• c-src/Fl_Return_ButtonC.cpp +124/−11
• c-src/Fl_Return_ButtonC.h +31/−0
• c-src/Fl_RollerC.cpp +125/−21
• c-src/Fl_RollerC.h +32/−0
• c-src/Fl_Round_ButtonC.cpp +124/−11
• c-src/Fl_Round_ButtonC.h +31/−0
• c-src/Fl_ScrollC.cpp +117/−10
• c-src/Fl_ScrollC.h +31/−0
• c-src/Fl_ScrollbarC.cpp +118/−17
• c-src/Fl_ScrollbarC.h +31/−0
• c-src/Fl_SliderC.cpp +114/−25
• c-src/Fl_SliderC.h +31/−0
• c-src/Fl_SpinnerC.cpp +118/−11
• c-src/Fl_SpinnerC.h +32/−0
• c-src/Fl_Sys_Menu_BarC.cpp +118/−17
• c-src/Fl_Sys_Menu_BarC.h +31/−0
• c-src/Fl_Table_RowC.cpp +27/−28
• c-src/Fl_Table_RowC.h +8/−7
• c-src/Fl_TabsC.cpp +124/−14
• c-src/Fl_TabsC.h +32/−0
• c-src/Fl_Text_DisplayC.cpp +166/−56
• c-src/Fl_Text_DisplayC.h +31/−0
• c-src/Fl_Text_EditorC.cpp +178/−141
• c-src/Fl_Text_EditorC.h +14/−1
• c-src/Fl_TileC.cpp +122/−12
• c-src/Fl_TileC.h +32/−0
• c-src/Fl_TimerC.cpp +108/−16
• c-src/Fl_TimerC.h +30/−0
• c-src/Fl_TreeC.cpp +130/−25
• c-src/Fl_TreeC.h +31/−0
• c-src/Fl_Value_InputC.cpp +123/−14
• c-src/Fl_Value_InputC.h +32/−0
• c-src/Fl_Value_OutputC.cpp +124/−14
• c-src/Fl_Value_OutputC.h +32/−0
• c-src/Fl_Value_SliderC.cpp +121/−17
• c-src/Fl_Value_SliderC.h +33/−1
• c-src/Fl_WizardC.cpp +145/−11
• c-src/Fl_WizardC.h +33/−0
• c-src/Makefile.in +1/−1
• fltkhs.cabal +1/−1
• scripts/skeletons.el +458/−0
• src/Graphics/UI/FLTK/LowLevel/Adjuster.chs +77/−1
• src/Graphics/UI/FLTK/LowLevel/CheckButton.chs +77/−1
• src/Graphics/UI/FLTK/LowLevel/Choice.chs +70/−1
• src/Graphics/UI/FLTK/LowLevel/Clock.chs +77/−4
• src/Graphics/UI/FLTK/LowLevel/ColorChooser.chs +78/−1
• src/Graphics/UI/FLTK/LowLevel/Counter.chs +82/−7
• src/Graphics/UI/FLTK/LowLevel/Dial.chs +80/−6
• src/Graphics/UI/FLTK/LowLevel/FileBrowser.chs +78/−0
• src/Graphics/UI/FLTK/LowLevel/FileInput.chs +76/−3
• src/Graphics/UI/FLTK/LowLevel/Group.chs +8/−0
• src/Graphics/UI/FLTK/LowLevel/Hierarchy.hs +321/−57
• src/Graphics/UI/FLTK/LowLevel/Input.chs +72/−2
• src/Graphics/UI/FLTK/LowLevel/LightButton.chs +75/−2
• src/Graphics/UI/FLTK/LowLevel/MenuBar.chs +70/−4
• src/Graphics/UI/FLTK/LowLevel/MenuButton.chs +73/−6
• src/Graphics/UI/FLTK/LowLevel/Output.chs +77/−1
• src/Graphics/UI/FLTK/LowLevel/Pack.chs +75/−4
• src/Graphics/UI/FLTK/LowLevel/Positioner.chs +80/−13
• src/Graphics/UI/FLTK/LowLevel/Progress.chs +79/−4
• src/Graphics/UI/FLTK/LowLevel/RepeatButton.chs +73/−7
• src/Graphics/UI/FLTK/LowLevel/ReturnButton.chs +55/−4
• src/Graphics/UI/FLTK/LowLevel/Roller.chs +51/−4
• src/Graphics/UI/FLTK/LowLevel/RoundButton.chs +74/−4
• src/Graphics/UI/FLTK/LowLevel/Scrollbar.chs +76/−7
• src/Graphics/UI/FLTK/LowLevel/Scrolled.chs +76/−12
• src/Graphics/UI/FLTK/LowLevel/Slider.chs +81/−11
• src/Graphics/UI/FLTK/LowLevel/Spinner.chs +71/−5
• src/Graphics/UI/FLTK/LowLevel/SysMenuBar.chs +73/−7
• src/Graphics/UI/FLTK/LowLevel/TableRow.chs +32/−2
• src/Graphics/UI/FLTK/LowLevel/Tabs.chs +55/−5
• src/Graphics/UI/FLTK/LowLevel/TextDisplay.chs +78/−12
• src/Graphics/UI/FLTK/LowLevel/TextEditor.chs +72/−6
• src/Graphics/UI/FLTK/LowLevel/Tile.chs +68/−8
• src/Graphics/UI/FLTK/LowLevel/Timer.chs +76/−8
• src/Graphics/UI/FLTK/LowLevel/Tree.chs +72/−8
• src/Graphics/UI/FLTK/LowLevel/ValueInput.chs +75/−9
• src/Graphics/UI/FLTK/LowLevel/ValueOutput.chs +71/−9
• src/Graphics/UI/FLTK/LowLevel/ValueSlider.chs +77/−10
• src/Graphics/UI/FLTK/LowLevel/Wizard.chs +75/−2

@@ -5,13 +5,24 @@ DerivedText_Editor::Key_Binding_With_Callback* DerivedText_Editor::global_key_bindings = 0; #endif +DerivedText_Editor::DerivedText_Editor(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Text_Editor(X,Y,W,H,l){+  overriddenFuncs = funcs;+  other_data = (void*)0;+}+DerivedText_Editor::DerivedText_Editor(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Text_Editor(X,Y,W,H){+  overriddenFuncs = funcs;+  other_data = (void*)0;+}+DerivedText_Editor::~DerivedText_Editor(){+  free(overriddenFuncs);+} DerivedText_Editor::DerivedText_Editor(int x,int y,int w,int h,const char* t) : Fl_Text_Editor(x,y,w,h,t){-    key_bindings = 0;-    key_bindings = get_default_keybindings();-    curr_callback_context = 0;-    default_callback_context_ = 0;-    default_key_function_ = C_to_Fl_Callback::intercept;- }+  key_bindings = 0;+  key_bindings = get_default_keybindings();+  curr_callback_context = 0;+  default_callback_context_ = 0;+  default_key_function_ = C_to_Fl_Callback::intercept;+} C_to_Fl_Callback* DerivedText_Editor::get_curr_callback_context(){   return curr_callback_context; }@@ -34,9 +45,9 @@   replace_key_bindings(&key_bindings, l); } void DerivedText_Editor::add_key_binding(int key,-					 int state,-					 C_to_Fl_Callback* callback_context,-					 Key_Binding_With_Callback** list){+                                         int state,+                                         C_to_Fl_Callback* callback_context,+                                         Key_Binding_With_Callback** list){   Key_Binding_With_Callback* curr = *list;   // iterate to the last binding   while(curr->next){curr = curr->next;}@@ -94,7 +105,7 @@   Key_Binding_With_Callback* curr = *list;   Key_Binding_With_Callback* last = NULL;   for (;curr;last = curr, curr = curr->next){-     if (curr->key == key && curr->state == state) break;+    if (curr->key == key && curr->state == state) break;   }   if (!curr) return;   if (last) last->next = curr->next;@@ -127,7 +138,7 @@     if (Fl::compose_state) {       int pos = this->insert_position();       this->buffer()->select(pos - Fl::compose_state, pos);-      }+    } #endif     show_insert_position();     set_changed();@@ -144,4 +155,67 @@   if (f) return C_to_Fl_Callback::intercept(key, this);   if (default_key_function_ && !state) return default_key_function_(c, this);   return 0;+}++void DerivedText_Editor::draw(){+  if (this->overriddenFuncs->draw != NULL) {+    this->overriddenFuncs->draw((fl_Text_Editor) this);+  }+  else {+    Fl_Text_Editor::draw();+  }+}++void DerivedText_Editor::draw_super(){+  Fl_Text_Editor::draw();+}++int DerivedText_Editor::handle(int event){+  int i;+  if (this->overriddenFuncs->handle != NULL) {+    i = this->overriddenFuncs->handle((fl_Text_Editor) this,event);+  }+  else {+    i = Fl_Text_Editor::handle(event);+  }+  return i;+}+int DerivedText_Editor::handle_super(int event){+  return Fl_Text_Editor::handle(event);+}++void DerivedText_Editor::resize(int x, int y, int w, int h){+  if (this->overriddenFuncs->resize != NULL) {+    this->overriddenFuncs->resize((fl_Text_Editor) this,x,y,w,h);+  }+  else {+    Fl_Text_Editor::resize(x,y,w,h);+  }+}++void DerivedText_Editor::resize_super(int x, int y, int w, int h){+  Fl_Text_Editor::resize(x,y,w,h);+}+void DerivedText_Editor::show(){+  if (this->overriddenFuncs->show != NULL) {+    this->overriddenFuncs->show((fl_Text_Editor) this);+  }+  else {+    Fl_Text_Editor::show();+  }+}+void DerivedText_Editor::show_super(){+  Fl_Text_Editor::show();+}++void DerivedText_Editor::hide(){+  if (this->overriddenFuncs->hide != NULL) {+    this->overriddenFuncs->hide((fl_Text_Editor) this);+  }+  else {+    Fl_Text_Editor::hide();+  }+}+void DerivedText_Editor::hide_super(){+  Fl_Text_Editor::hide(); }

@@ -2,12 +2,14 @@ #define __DERIVEDTEXT_EDITOR__ #include "FL/Fl.H" #include "FL/Fl_Text_Editor.H"-+#include "Fl_Types.h" class C_to_Fl_Callback;  class DerivedText_Editor : public Fl_Text_Editor {  private:   C_to_Fl_Callback* curr_callback_context;+  fl_Widget_Virtual_Funcs* overriddenFuncs;+  void* other_data;  public:   typedef int (*Key_Func)(int key, DerivedText_Editor* editor);   struct Key_Binding_With_Callback {@@ -32,10 +34,10 @@    // Unlike Fl_Text_Editor a new binding is appended rather than prepended   void add_key_binding(int key, int state, C_to_Fl_Callback* callback_context,-		       Key_Binding_With_Callback** list);+                       Key_Binding_With_Callback** list);    void add_key_binding(Key_Binding_With_Callback* new_bindings,-		       Key_Binding_With_Callback** old_bindings){+                       Key_Binding_With_Callback** old_bindings){     Key_Binding_With_Callback* curr = *old_bindings;     // iterate to the last binding     while(curr->next){curr = curr->next;}@@ -58,11 +60,23 @@   C_to_Fl_Callback* get_curr_callback_context();   C_to_Fl_Callback* get_default_callback_context();   DerivedText_Editor(int x,int y,int w,int h,const char* t=0);+  DerivedText_Editor(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+  DerivedText_Editor(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+  virtual void draw();+  void draw_super();+  virtual int handle(int event);+  int handle_super(int event);+  virtual void resize(int x, int y, int w, int h);+  void resize_super(int x, int y, int w, int h);+  virtual void show();+  void show_super();+  virtual void hide();+  void hide_super();+  ~DerivedText_Editor();  protected:   int handle_key();   Key_Func default_key_function_;   static Key_Binding_With_Callback* global_key_bindings;   C_to_Fl_Callback* default_callback_context_; };- #endif /* __DERIVEDTEXT_EDITOR__  */

@@ -1,7 +1,81 @@ #include "Fl_AdjusterC.h" #ifdef __cplusplus EXPORT {-#endif  +  Fl_DerivedAdjuster::Fl_DerivedAdjuster(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Adjuster(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedAdjuster::Fl_DerivedAdjuster(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Adjuster(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedAdjuster::~Fl_DerivedAdjuster(){+    free(overriddenFuncs);+  }+  void Fl_DerivedAdjuster::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Adjuster) this);+    }+    else {+      Fl_Adjuster::draw();+    }+  }++  void Fl_DerivedAdjuster::draw_super(){+    Fl_Adjuster::draw();+  }++  int Fl_DerivedAdjuster::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Adjuster) this,event);+    }+    else {+      i = Fl_Adjuster::handle(event);+    }+    return i;+  }+  int Fl_DerivedAdjuster::handle_super(int event){+    return Fl_Adjuster::handle(event);+  }++  void Fl_DerivedAdjuster::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Adjuster) this,x,y,w,h);+    }+    else {+      Fl_Adjuster::resize(x,y,w,h);+    }+  }++  void Fl_DerivedAdjuster::resize_super(int x, int y, int w, int h){+    Fl_Adjuster::resize(x,y,w,h);+  }+  void Fl_DerivedAdjuster::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Adjuster) this);+    }+    else {+      Fl_Adjuster::show();+    }+  }+  void Fl_DerivedAdjuster::show_super(){+    Fl_Adjuster::show();+  }++  void Fl_DerivedAdjuster::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Adjuster) this);+    }+    else {+      Fl_Adjuster::hide();+    }+  }+  void Fl_DerivedAdjuster::hide_super(){+    Fl_Adjuster::hide();+  }++#endif   FL_EXPORT_C(fl_Group,Fl_Adjuster_parent)(fl_Adjuster adjuster){     return (static_cast<Fl_Adjuster*>(adjuster))->parent();   }@@ -152,12 +226,6 @@   FL_EXPORT_C(int,Fl_Adjuster_visible_r)(fl_Adjuster adjuster){     return (static_cast<Fl_Adjuster*>(adjuster))->visible_r();   }-  FL_EXPORT_C(void,Fl_Adjuster_show)(fl_Adjuster adjuster){-    (static_cast<Fl_Adjuster*>(adjuster))->show();-  }-  FL_EXPORT_C(void,Fl_Adjuster_hide)(fl_Adjuster adjuster){-    (static_cast<Fl_Adjuster*>(adjuster))->hide();-  }   FL_EXPORT_C(void,Fl_Adjuster_set_visible)(fl_Adjuster adjuster){     (static_cast<Fl_Adjuster*>(adjuster))->visible();   }@@ -254,9 +322,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Adjuster_as_gl_window)(fl_Adjuster adjuster){     return (static_cast<Fl_Adjuster*>(adjuster))->as_gl_window();   }-  FL_EXPORT_C(void,Fl_Adjuster_resize)(fl_Adjuster adjuster,int X,int Y,int W,int H){-    (static_cast<Fl_Adjuster*>(adjuster))->resize(X,Y,W,H);-  }   FL_EXPORT_C(void,Fl_Adjuster_bounds)(fl_Adjuster adjuster,double a,double b){     (static_cast<Fl_Adjuster*>(adjuster))->bounds(a,b);   }@@ -308,14 +373,6 @@   FL_EXPORT_C(double,Fl_Adjuster_increment)(fl_Adjuster adjuster,double v,int n){     return (static_cast<Fl_Adjuster*>(adjuster))->increment(v,n);   }-  FL_EXPORT_C(fl_Adjuster,Fl_Adjuster_New_WithLabel)(int x,int y,int w,int h,const char* label){-    Fl_Adjuster* adjuster = new Fl_Adjuster(x,y,w,h,label);-    return (fl_Adjuster) adjuster;-  }-  FL_EXPORT_C(fl_Adjuster,Fl_Adjuster_New)(int x,int y,int w,int h){-    Fl_Adjuster* adjuster = new Fl_Adjuster(x,y,w,h);-    return (fl_Adjuster) adjuster;-  }   FL_EXPORT_C(void,Fl_Adjuster_Destroy)(fl_Adjuster adjuster){     delete (static_cast<Fl_Adjuster*>(adjuster));   }@@ -325,6 +382,55 @@   FL_EXPORT_C(void,Fl_Adjuster_set_soft)(fl_Adjuster adjuster,int soft){     (static_cast<Fl_Adjuster*>(adjuster))->soft(soft);   }+  FL_EXPORT_C(fl_Adjuster,    Fl_Adjuster_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedAdjuster* w = new Fl_DerivedAdjuster(X,Y,W,H,fs);+    return (fl_Adjuster)w;+  }+  FL_EXPORT_C(fl_Adjuster,    Fl_Adjuster_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedAdjuster* w = new Fl_DerivedAdjuster(X,Y,W,H,label,fs);+    return (fl_Adjuster)w;+  }+  FL_EXPORT_C(fl_Adjuster,    Fl_OverriddenAdjuster_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedAdjuster* w = new Fl_DerivedAdjuster(X,Y,W,H,fs);+    return (fl_Adjuster)w;+  }+  FL_EXPORT_C(fl_Adjuster,    Fl_OverriddenAdjuster_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedAdjuster* w = new Fl_DerivedAdjuster(X,Y,W,H,label,fs);+    return (fl_Adjuster)w;+  }+  FL_EXPORT_C(void, Fl_Adjuster_draw)(fl_Adjuster o){+    (static_cast<Fl_DerivedAdjuster*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Adjuster_draw_super)(fl_Adjuster o){+    (static_cast<Fl_DerivedAdjuster*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Adjuster_handle)(fl_Adjuster o, int event){+    return (static_cast<Fl_DerivedAdjuster*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Adjuster_handle_super)(fl_Adjuster o, int event){+    return (static_cast<Fl_DerivedAdjuster*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Adjuster_resize)(fl_Adjuster o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedAdjuster*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Adjuster_resize_super)(fl_Adjuster o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedAdjuster*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Adjuster_show)(fl_Adjuster o){+    (static_cast<Fl_DerivedAdjuster*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Adjuster_show_super)(fl_Adjuster o){+    (static_cast<Fl_DerivedAdjuster*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Adjuster_hide)(fl_Adjuster o){+    (static_cast<Fl_DerivedAdjuster*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Adjuster_hide_super)(fl_Adjuster o){+    (static_cast<Fl_DerivedAdjuster*>(o))->hide_super();+  }+ #ifdef __cplusplus }-#endif +#endif

@@ -7,7 +7,27 @@ #include "FL/Fl.H" #include "FL/Fl_Adjuster.H" #include "Fl_CallbackC.h"+#include "Fl_Types.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedAdjuster : public Fl_Adjuster {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedAdjuster(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedAdjuster(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedAdjuster();+  }; #endif   FL_EXPORT_C(fl_Group,     Fl_Adjuster_parent)(fl_Adjuster adjuster);   FL_EXPORT_C(void,         Fl_Adjuster_set_parent)(fl_Adjuster adjuster, fl_Group grp);@@ -57,8 +77,6 @@   FL_EXPORT_C(void,         Fl_Adjuster_set_when)(fl_Adjuster adjuster, uchar i);   FL_EXPORT_C(unsigned int, Fl_Adjuster_visible)(fl_Adjuster adjuster);   FL_EXPORT_C(int,          Fl_Adjuster_visible_r)(fl_Adjuster adjuster);-  FL_EXPORT_C(void,         Fl_Adjuster_show)(fl_Adjuster adjuster);-  FL_EXPORT_C(void,         Fl_Adjuster_hide)(fl_Adjuster adjuster);   FL_EXPORT_C(void,         Fl_Adjuster_set_visible)(fl_Adjuster adjuster);   FL_EXPORT_C(void,         Fl_Adjuster_clear_visible)(fl_Adjuster adjuster);   FL_EXPORT_C(unsigned int, Fl_Adjuster_active)(fl_Adjuster adjuster);@@ -91,7 +109,6 @@   FL_EXPORT_C(fl_Window,    Fl_Adjuster_top_window)(fl_Adjuster adjuster);   FL_EXPORT_C(fl_Window ,   Fl_Adjuster_top_window_offset)(fl_Adjuster adjuster, int* xoff, int* yoff);   FL_EXPORT_C(fl_Gl_Window, Fl_Adjuster_as_gl_window)(fl_Adjuster adjuster);-  FL_EXPORT_C(void,         Fl_Adjuster_resize)(fl_Table table,int X, int Y, int W, int H);    /* Inherited from Fl_Valuator */   FL_EXPORT_C(void, Fl_Adjuster_bounds)(fl_Adjuster adjuster, double a, double b);@@ -118,6 +135,20 @@   FL_EXPORT_C(void,      Fl_Adjuster_Destroy)(fl_Adjuster adjuster);   FL_EXPORT_C(int,      Fl_Adjuster_soft)(fl_Adjuster adjuster);   FL_EXPORT_C(void,      Fl_Adjuster_set_soft)(fl_Adjuster adjuster, int soft);++  FL_EXPORT_C(fl_Adjuster,    Fl_OverriddenAdjuster_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Adjuster,    Fl_OverriddenAdjuster_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Adjuster_draw)(fl_Adjuster o);+  FL_EXPORT_C(void, Fl_Adjuster_draw_super)(fl_Adjuster o);+  FL_EXPORT_C(int, Fl_Adjuster_handle)(fl_Adjuster o, int event);+  FL_EXPORT_C(int, Fl_Adjuster_handle_super)(fl_Adjuster o, int event);+  FL_EXPORT_C(void, Fl_Adjuster_resize)(fl_Adjuster o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Adjuster_resize_super)(fl_Adjuster o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Adjuster_show)(fl_Adjuster o);+  FL_EXPORT_C(void, Fl_Adjuster_show_super)(fl_Adjuster o);+  FL_EXPORT_C(void, Fl_Adjuster_hide)(fl_Adjuster o);+  FL_EXPORT_C(void, Fl_Adjuster_hide_super)(fl_Adjuster o);+ #ifdef __cplusplus } #endif

@@ -15,6 +15,7 @@ #include <FL/Fl_Text_Editor.H> #include <FL/Fl_File_Chooser.H> #include <stdio.h>+ /**   Pass a C callback function to an Fl_Window */

@@ -2,10 +2,82 @@  #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Check_Button_handle)(fl_Check_Button self, int event){-    return (static_cast<Fl_Check_Button*>(self))->handle(event);+  Fl_DerivedCheck_Button::Fl_DerivedCheck_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Check_Button(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedCheck_Button::Fl_DerivedCheck_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Check_Button(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedCheck_Button::~Fl_DerivedCheck_Button(){+    free(overriddenFuncs);+  }+  void Fl_DerivedCheck_Button::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Check_Button) this);+    }+    else {+      Fl_Check_Button::draw();+    }+  }++  void Fl_DerivedCheck_Button::draw_super(){+    Fl_Check_Button::draw();+  }++  int Fl_DerivedCheck_Button::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Check_Button) this,event);+    }+    else {+      i = Fl_Check_Button::handle(event);+    }+    return i;+  }+  int Fl_DerivedCheck_Button::handle_super(int event){+    return Fl_Check_Button::handle(event);+  }++  void Fl_DerivedCheck_Button::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Check_Button) this,x,y,w,h);+    }+    else {+      Fl_Check_Button::resize(x,y,w,h);+    }+  }++  void Fl_DerivedCheck_Button::resize_super(int x, int y, int w, int h){+    Fl_Check_Button::resize(x,y,w,h);+  }+  void Fl_DerivedCheck_Button::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Check_Button) this);+    }+    else {+      Fl_Check_Button::show();+    }+  }+  void Fl_DerivedCheck_Button::show_super(){+    Fl_Check_Button::show();+  }++  void Fl_DerivedCheck_Button::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Check_Button) this);+    }+    else {+      Fl_Check_Button::hide();+    }+  }+  void Fl_DerivedCheck_Button::hide_super(){+    Fl_Check_Button::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Check_Button_parent)(fl_Check_Button b){     return (fl_Group) (static_cast<Fl_Check_Button*>(b))->parent();   }@@ -251,14 +323,6 @@     (static_cast<Fl_Check_Button*>(b))->measure_label(*ww,*hh);   } -  FL_EXPORT_C(fl_Check_Button, Fl_Check_Button_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Check_Button* button = new Fl_Check_Button(x,y,w,h,label);-    return (static_cast<fl_Check_Button>(button));-  }-  FL_EXPORT_C(fl_Check_Button, Fl_Check_Button_New)(int x, int y, int w, int h) {-    Fl_Check_Button* button = new Fl_Check_Button(x,y,w,h,0);-    return (fl_Check_Button)button;-  }   FL_EXPORT_C(void,Fl_Check_Button_Destroy)(fl_Check_Button button){     delete (static_cast<Fl_Check_Button*>(button));   }@@ -292,6 +356,55 @@   FL_EXPORT_C(void,Fl_Check_Button_set_down_color)(fl_Check_Button b,Fl_Color c){     (static_cast<Fl_Check_Button*>(b))->down_color(c);   }+  FL_EXPORT_C(fl_Check_Button,    Fl_Check_Button_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedCheck_Button* w = new Fl_DerivedCheck_Button(X,Y,W,H,fs);+    return (fl_Check_Button)w;+  }+  FL_EXPORT_C(fl_Check_Button,    Fl_Check_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedCheck_Button* w = new Fl_DerivedCheck_Button(X,Y,W,H,label,fs);+    return (fl_Check_Button)w;+  }+  FL_EXPORT_C(fl_Check_Button,    Fl_OverriddenCheck_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedCheck_Button* w = new Fl_DerivedCheck_Button(X,Y,W,H,fs);+    return (fl_Check_Button)w;+  }+  FL_EXPORT_C(fl_Check_Button,    Fl_OverriddenCheck_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedCheck_Button* w = new Fl_DerivedCheck_Button(X,Y,W,H,label,fs);+    return (fl_Check_Button)w;+  }+  FL_EXPORT_C(void, Fl_Check_Button_draw)(fl_Check_Button o){+    (static_cast<Fl_DerivedCheck_Button*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Check_Button_draw_super)(fl_Check_Button o){+    (static_cast<Fl_DerivedCheck_Button*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Check_Button_handle)(fl_Check_Button o, int event){+    return (static_cast<Fl_DerivedCheck_Button*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Check_Button_handle_super)(fl_Check_Button o, int event){+    return (static_cast<Fl_DerivedCheck_Button*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Check_Button_resize)(fl_Check_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedCheck_Button*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Check_Button_resize_super)(fl_Check_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedCheck_Button*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Check_Button_show)(fl_Check_Button o){+    (static_cast<Fl_DerivedCheck_Button*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Check_Button_show_super)(fl_Check_Button o){+    (static_cast<Fl_DerivedCheck_Button*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Check_Button_hide)(fl_Check_Button o){+    (static_cast<Fl_DerivedCheck_Button*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Check_Button_hide_super)(fl_Check_Button o){+    (static_cast<Fl_DerivedCheck_Button*>(o))->hide_super();+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Check_Button.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedCheck_Button : public Fl_Check_Button {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedCheck_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedCheck_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedCheck_Button();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Check_Button_handle)(fl_Check_Button self, int event);@@ -93,7 +112,7 @@   FL_EXPORT_C(fl_Check_Button, Fl_Check_Button_New_WithLabel)(int x, int y, int w, int h, const char* label);   FL_EXPORT_C(fl_Check_Button, Fl_Check_Button_New)(int x, int y, int w, int h);   FL_EXPORT_C(void,            Fl_Check_Button_Destroy)(fl_Check_Button button);-  +   FL_EXPORT_C(char        , Fl_Check_Button_value)(fl_Check_Button b);   FL_EXPORT_C(int         , Fl_Check_Button_set_value)(fl_Check_Button b, int v);   FL_EXPORT_C(int         , Fl_Check_Button_set)(fl_Check_Button b);@@ -105,6 +124,19 @@   FL_EXPORT_C(void        , Fl_Check_Button_set_down_box)(fl_Check_Button b,Fl_Boxtype boxtype);   FL_EXPORT_C(Fl_Color    , Fl_Check_Button_down_color )(fl_Check_Button b);   FL_EXPORT_C(void        , Fl_Check_Button_set_down_color)(fl_Check_Button b, Fl_Color c);+  FL_EXPORT_C(fl_Check_Button,    Fl_OverriddenCheck_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Check_Button,    Fl_OverriddenCheck_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Check_Button_draw)(fl_Check_Button o);+  FL_EXPORT_C(void, Fl_Check_Button_draw_super)(fl_Check_Button o);+  FL_EXPORT_C(int, Fl_Check_Button_handle)(fl_Check_Button o, int event);+  FL_EXPORT_C(int, Fl_Check_Button_handle_super)(fl_Check_Button o, int event);+  FL_EXPORT_C(void, Fl_Check_Button_resize)(fl_Check_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Check_Button_resize_super)(fl_Check_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Check_Button_show)(fl_Check_Button o);+  FL_EXPORT_C(void, Fl_Check_Button_show_super)(fl_Check_Button o);+  FL_EXPORT_C(void, Fl_Check_Button_hide)(fl_Check_Button o);+  FL_EXPORT_C(void, Fl_Check_Button_hide_super)(fl_Check_Button o);+ #ifdef __cplusplus } #endif

@@ -2,28 +2,82 @@ #include "UtilsC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Choice_handle )(fl_Choice choice, int event){-    return (static_cast<Fl_Choice*>(choice))->handle(event);+  Fl_DerivedChoice::Fl_DerivedChoice(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Choice(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Choice_resize_super )(fl_Choice choice,int x, int y, int w, int h){-    (static_cast<Fl_Choice*>(choice))->resize(x,y,w,h);+  Fl_DerivedChoice::Fl_DerivedChoice(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Choice(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Choice_resize )(fl_Choice choice,int x, int y, int w, int h){-    (static_cast<Fl_Choice*>(choice))->resize(x,y,w,h);+  Fl_DerivedChoice::~Fl_DerivedChoice(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Choice_show_super)(fl_Choice choice){-    (static_cast<Fl_Choice*>(choice))->show();+  void Fl_DerivedChoice::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Choice) this);+    }+    else {+      Fl_Choice::draw();+    }   }-  FL_EXPORT_C(void,Fl_Choice_show )(fl_Choice choice){-    (static_cast<Fl_Choice*>(choice))->show();++  void Fl_DerivedChoice::draw_super(){+    Fl_Choice::draw();   }-  FL_EXPORT_C(void,Fl_Choice_hide_super)(fl_Choice choice){-    (static_cast<Fl_Choice*>(choice))->hide();++  int Fl_DerivedChoice::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Choice) this,event);+    }+    else {+      i = Fl_Choice::handle(event);+    }+    return i;   }-  FL_EXPORT_C(void,Fl_Choice_hide )(fl_Choice choice){-    (static_cast<Fl_Choice*>(choice))->hide();+  int Fl_DerivedChoice::handle_super(int event){+    return Fl_Choice::handle(event);   }++  void Fl_DerivedChoice::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Choice) this,x,y,w,h);+    }+    else {+      Fl_Choice::resize(x,y,w,h);+    }+  }++  void Fl_DerivedChoice::resize_super(int x, int y, int w, int h){+    Fl_Choice::resize(x,y,w,h);+  }+  void Fl_DerivedChoice::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Choice) this);+    }+    else {+      Fl_Choice::show();+    }+  }+  void Fl_DerivedChoice::show_super(){+    Fl_Choice::show();+  }++  void Fl_DerivedChoice::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Choice) this);+    }+    else {+      Fl_Choice::hide();+    }+  }+  void Fl_DerivedChoice::hide_super(){+    Fl_Choice::hide();+  }+++#endif   FL_EXPORT_C(fl_Window,Fl_Choice_as_window_super)(fl_Choice choice){     return (static_cast<Fl_Choice*>(choice))->as_window();   }@@ -273,14 +327,6 @@   FL_EXPORT_C(void,Fl_Choice_measure_label)(fl_Choice choice,int* ww,int* hh){     (static_cast<Fl_Choice*>(choice))->measure_label(*ww,*hh);   }-  FL_EXPORT_C(fl_Choice, Fl_Choice_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Choice* choice = new Fl_Choice(x,y,w,h,label);-    return (static_cast<fl_Choice>(choice));-  }-  FL_EXPORT_C(fl_Choice, Fl_Choice_New)(int x, int y, int w, int h) {-    Fl_Choice* choice = new Fl_Choice(x,y,w,h);-    return (static_cast<fl_Choice>(choice));-  }   FL_EXPORT_C(void, Fl_Choice_Destroy)(fl_Choice choice) {     delete (static_cast<Fl_Choice*>(choice));   }@@ -439,6 +485,55 @@   FL_EXPORT_C(void,Fl_Choice_set_down_color)(fl_Choice choice,unsigned c){     (static_cast<Fl_Choice*>(choice))->down_color(c);   }+  FL_EXPORT_C(fl_Choice,    Fl_Choice_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedChoice* w = new Fl_DerivedChoice(X,Y,W,H,fs);+    return (fl_Choice)w;+  }+  FL_EXPORT_C(fl_Choice,    Fl_Choice_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedChoice* w = new Fl_DerivedChoice(X,Y,W,H,label,fs);+    return (fl_Choice)w;+  }+  FL_EXPORT_C(fl_Choice,    Fl_OverriddenChoice_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedChoice* w = new Fl_DerivedChoice(X,Y,W,H,fs);+    return (fl_Choice)w;+  }+  FL_EXPORT_C(fl_Choice,    Fl_OverriddenChoice_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedChoice* w = new Fl_DerivedChoice(X,Y,W,H,label,fs);+    return (fl_Choice)w;+  }+  FL_EXPORT_C(void, Fl_Choice_draw)(fl_Choice o){+    (static_cast<Fl_DerivedChoice*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Choice_draw_super)(fl_Choice o){+    (static_cast<Fl_DerivedChoice*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Choice_handle)(fl_Choice o, int event){+    return (static_cast<Fl_DerivedChoice*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Choice_handle_super)(fl_Choice o, int event){+    return (static_cast<Fl_DerivedChoice*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Choice_resize)(fl_Choice o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedChoice*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Choice_resize_super)(fl_Choice o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedChoice*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Choice_show)(fl_Choice o){+    (static_cast<Fl_DerivedChoice*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Choice_show_super)(fl_Choice o){+    (static_cast<Fl_DerivedChoice*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Choice_hide)(fl_Choice o){+    (static_cast<Fl_DerivedChoice*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Choice_hide_super)(fl_Choice o){+    (static_cast<Fl_DerivedChoice*>(o))->hide_super();+  }+ #ifdef __cplusplus } #endif

@@ -8,10 +8,28 @@ #include "FL/Fl_Choice.H" #include "Fl_CallbackC.h" #include "Fl_Menu_C.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedChoice : public Fl_Choice {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedChoice(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedChoice(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedChoice();+  }; #endif   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int,          Fl_Choice_handle)(fl_Group self, int event);   FL_EXPORT_C(fl_Group,     Fl_Choice_parent)(fl_Choice choice);   FL_EXPORT_C(void,         Fl_Choice_set_parent)(fl_Choice choice, fl_Group grp);   FL_EXPORT_C(uchar,        Fl_Choice_type)(fl_Choice choice);@@ -60,10 +78,6 @@   FL_EXPORT_C(void,         Fl_Choice_set_when)(fl_Choice choice, uchar i);   FL_EXPORT_C(unsigned int, Fl_Choice_visible)(fl_Choice choice);   FL_EXPORT_C(int,          Fl_Choice_visible_r)(fl_Choice choice);-  FL_EXPORT_C(void,         Fl_Choice_show_super)(fl_Choice choice);-  FL_EXPORT_C(void,         Fl_Choice_show)(fl_Choice choice);-  FL_EXPORT_C(void,         Fl_Choice_hide_super)(fl_Choice choice);-  FL_EXPORT_C(void,         Fl_Choice_hide)(fl_Choice choice);   FL_EXPORT_C(void,         Fl_Choice_set_visible)(fl_Choice choice);   FL_EXPORT_C(void,         Fl_Choice_clear_visible)(fl_Choice choice);   FL_EXPORT_C(unsigned int, Fl_Choice_active)(fl_Choice choice);@@ -105,7 +119,7 @@   FL_EXPORT_C(void,         Fl_Choice_resize_super)(fl_Choice choice,int X, int Y, int W, int H);   FL_EXPORT_C(void,         Fl_Choice_resize)(fl_Choice choice,int X, int Y, int W, int H); -  /* Fl_Choice specific */ +  /* Fl_Choice specific */   FL_EXPORT_C(fl_Choice,    Fl_Choice_New_WithLabel)(int x, int y, int w, int h, const char* label);   FL_EXPORT_C(fl_Choice   , Fl_Choice_New)(int x, int y, int w, int h);   FL_EXPORT_C(void, Fl_Choice_Destroy)(fl_Choice choice);@@ -142,18 +156,18 @@   FL_EXPORT_C(int, Fl_Choice_add_with_shortcutname_user_data_flags)(fl_Choice choice, char* name,  char* shortcut, fl_Callback* cb, void* user_data, int flags);   FL_EXPORT_C(int, Fl_Choice_add_with_name)(fl_Choice choice,  char* name);   FL_EXPORT_C(int , Fl_Choice_size)(fl_Choice choice);-  FL_EXPORT_C(void, Fl_Choice_set_size)(fl_Choice choice, int W, int H); +  FL_EXPORT_C(void, Fl_Choice_set_size)(fl_Choice choice, int W, int H);   FL_EXPORT_C(void, Fl_Choice_clear)(fl_Choice choice);   FL_EXPORT_C(int, Fl_Choice_clear_submenu)(fl_Choice choice, int index);   FL_EXPORT_C(void, Fl_Choice_replace)(fl_Choice choice, int, char* name);   FL_EXPORT_C(void, Fl_Choice_remove)(fl_Choice choice, int);-  FL_EXPORT_C(void, Fl_Choice_shortcut)(fl_Choice choice, int i, int s); -  FL_EXPORT_C(void, Fl_Choice_set_mode)(fl_Choice choice, int i,int fl); -  FL_EXPORT_C(int , Fl_Choice_mode)(fl_Choice choice, int i);  +  FL_EXPORT_C(void, Fl_Choice_shortcut)(fl_Choice choice, int i, int s);+  FL_EXPORT_C(void, Fl_Choice_set_mode)(fl_Choice choice, int i,int fl);+  FL_EXPORT_C(int , Fl_Choice_mode)(fl_Choice choice, int i);   FL_EXPORT_C(fl_Menu_Item, Fl_Choice_mvalue)(fl_Choice choice);   FL_EXPORT_C(int, Fl_Choice_value)(fl_Choice choice);   FL_EXPORT_C(int, Fl_Choice_set_value_with_item)(fl_Choice choice,  fl_Menu_Item item);-  FL_EXPORT_C(int, Fl_Choice_set_value_with_index)(fl_Choice choice, int index); +  FL_EXPORT_C(int, Fl_Choice_set_value_with_index)(fl_Choice choice, int index);   FL_EXPORT_C(char*, Fl_Choice_text)(fl_Choice choice);   FL_EXPORT_C(char*, Fl_Choice_text_with_index)(fl_Choice choice, int i);   FL_EXPORT_C(Fl_Font, Fl_Choice_textfont)(fl_Choice choice);@@ -166,6 +180,19 @@   FL_EXPORT_C(void, Fl_Choice_set_down_box)(fl_Choice choice, Fl_Boxtype b);   FL_EXPORT_C(Fl_Color, Fl_Choice_down_color)(fl_Choice choice);   FL_EXPORT_C(void, Fl_Choice_set_down_color)(fl_Choice choice, unsigned c);+  FL_EXPORT_C(fl_Choice,    Fl_OverriddenChoice_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Choice,    Fl_OverriddenChoice_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Choice_draw)(fl_Choice o);+  FL_EXPORT_C(void, Fl_Choice_draw_super)(fl_Choice o);+  FL_EXPORT_C(int, Fl_Choice_handle)(fl_Choice o, int event);+  FL_EXPORT_C(int, Fl_Choice_handle_super)(fl_Choice o, int event);+  FL_EXPORT_C(void, Fl_Choice_resize)(fl_Choice o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Choice_resize_super)(fl_Choice o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Choice_show)(fl_Choice o);+  FL_EXPORT_C(void, Fl_Choice_show_super)(fl_Choice o);+  FL_EXPORT_C(void, Fl_Choice_hide)(fl_Choice o);+  FL_EXPORT_C(void, Fl_Choice_hide_super)(fl_Choice o);+ #ifdef __cplusplus } #endif

@@ -1,11 +1,82 @@ #include "Fl_ClockC.h"- #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Clock_handle)(fl_Clock self, int event){-    return (static_cast<Fl_Clock*>(self))->handle(event);+  Fl_DerivedClock::Fl_DerivedClock(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Clock(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedClock::Fl_DerivedClock(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Clock(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedClock::~Fl_DerivedClock(){+    free(overriddenFuncs);+  }+  void Fl_DerivedClock::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Clock) this);+    }+    else {+      Fl_Clock::draw();+    }+  }++  void Fl_DerivedClock::draw_super(){+    Fl_Clock::draw();+  }++  int Fl_DerivedClock::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Clock) this,event);+    }+    else {+      i = Fl_Clock::handle(event);+    }+    return i;+  }+  int Fl_DerivedClock::handle_super(int event){+    return Fl_Clock::handle(event);+  }++  void Fl_DerivedClock::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Clock) this,x,y,w,h);+    }+    else {+      Fl_Clock::resize(x,y,w,h);+    }+  }++  void Fl_DerivedClock::resize_super(int x, int y, int w, int h){+    Fl_Clock::resize(x,y,w,h);+  }+  void Fl_DerivedClock::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Clock) this);+    }+    else {+      Fl_Clock::show();+    }+  }+  void Fl_DerivedClock::show_super(){+    Fl_Clock::show();+  }++  void Fl_DerivedClock::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Clock) this);+    }+    else {+      Fl_Clock::hide();+    }+  }+  void Fl_DerivedClock::hide_super(){+    Fl_Clock::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Clock_parent)(fl_Clock b){     return (fl_Group) (static_cast<Fl_Clock*>(b))->parent();   }@@ -266,14 +337,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Clock_as_gl_window)(fl_Clock clock){     return (fl_Gl_Window) (static_cast<Fl_Clock*>(clock))->as_gl_window();   }-  FL_EXPORT_C(fl_Clock, Fl_Clock_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Clock* clock = new Fl_Clock(x,y,w,h,label);-    return (static_cast<fl_Clock>(clock));-  }-  FL_EXPORT_C(fl_Clock, Fl_Clock_New)(int x, int y, int w, int h) {-    Fl_Clock* clock = new Fl_Clock(x,y,w,h,0);-    return (fl_Clock)clock;-  }   FL_EXPORT_C(fl_Clock, Fl_Clock_New_WithClockType)(uchar t, int x, int y, int w, int h, const char* label) {     Fl_Clock* clock = new Fl_Clock(t,x,y,w,h,label);     return (fl_Clock)clock;@@ -298,6 +361,54 @@   }   FL_EXPORT_C(int,Fl_Clock_second)(fl_Clock clock){     return (static_cast<Fl_Clock*>(clock))->second();+  }+  FL_EXPORT_C(void, Fl_Clock_draw)(fl_Clock o){+    (static_cast<Fl_DerivedClock*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Clock_draw_super)(fl_Clock o){+    (static_cast<Fl_DerivedClock*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Clock_handle)(fl_Clock o, int event){+    return (static_cast<Fl_DerivedClock*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Clock_handle_super)(fl_Clock o, int event){+    return (static_cast<Fl_DerivedClock*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Clock_resize)(fl_Clock o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedClock*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Clock_resize_super)(fl_Clock o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedClock*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Clock_show)(fl_Clock o){+    (static_cast<Fl_DerivedClock*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Clock_show_super)(fl_Clock o){+    (static_cast<Fl_DerivedClock*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Clock_hide)(fl_Clock o){+    (static_cast<Fl_DerivedClock*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Clock_hide_super)(fl_Clock o){+    (static_cast<Fl_DerivedClock*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Clock,    Fl_Clock_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedClock* w = new Fl_DerivedClock(X,Y,W,H,fs);+    return (fl_Clock)w;+  }+  FL_EXPORT_C(fl_Clock,    Fl_Clock_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedClock* w = new Fl_DerivedClock(X,Y,W,H,label,fs);+    return (fl_Clock)w;+  }+  FL_EXPORT_C(fl_Clock,    Fl_OverriddenClock_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedClock* w = new Fl_DerivedClock(X,Y,W,H,fs);+    return (fl_Clock)w;+  }+  FL_EXPORT_C(fl_Clock,    Fl_OverriddenClock_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedClock* w = new Fl_DerivedClock(X,Y,W,H,label,fs);+    return (fl_Clock)w;   } #ifdef __cplusplus }

@@ -7,14 +7,33 @@ #include "FL/Fl.H" #include "FL/Fl_Clock.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedClock : public Fl_Clock {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedClock(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedClock(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedClock();+  };+ #endif #define FL_SQUARE_CLOCK		0 #define FL_ROUND_CLOCK		1 #define FL_ANALOG_CLOCK FL_SQUARE_CLOCK #define FL_DIGITAL_CLOCK FL_SQUARE_CLOCK   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int,Fl_Clock_handle)(fl_Clock self, int event);   FL_EXPORT_C(fl_Group,     Fl_Clock_parent)(fl_Clock clock);   FL_EXPORT_C(void,         Fl_Clock_set_parent)(fl_Clock clock, fl_Group grp);   FL_EXPORT_C(uchar,        Fl_Clock_type)(fl_Clock clock);@@ -107,6 +126,19 @@   FL_EXPORT_C(int, Fl_Clock_hour)(fl_Clock clock);   FL_EXPORT_C(int, Fl_Clock_minute)(fl_Clock clock);   FL_EXPORT_C(int, Fl_Clock_second)(fl_Clock clock);+  FL_EXPORT_C(fl_Clock,    Fl_OverriddenClock_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Clock,    Fl_OverriddenClock_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Clock_draw)(fl_Clock o);+  FL_EXPORT_C(void, Fl_Clock_draw_super)(fl_Clock o);+  FL_EXPORT_C(int, Fl_Clock_handle)(fl_Clock o, int event);+  FL_EXPORT_C(int, Fl_Clock_handle_super)(fl_Clock o, int event);+  FL_EXPORT_C(void, Fl_Clock_resize)(fl_Clock o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Clock_resize_super)(fl_Clock o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Clock_show)(fl_Clock o);+  FL_EXPORT_C(void, Fl_Clock_show_super)(fl_Clock o);+  FL_EXPORT_C(void, Fl_Clock_hide)(fl_Clock o);+  FL_EXPORT_C(void, Fl_Clock_hide_super)(fl_Clock o);+ #ifdef __cplusplus } #endif

@@ -1,367 +1,453 @@ #include "Fl_Color_ChooserC.h" #ifdef __cplusplus EXPORT {+  Fl_DerivedColor_Chooser::Fl_DerivedColor_Chooser(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Color_Chooser(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedColor_Chooser::Fl_DerivedColor_Chooser(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Color_Chooser(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedColor_Chooser::~Fl_DerivedColor_Chooser(){+    free(overriddenFuncs);+  }+  void Fl_DerivedColor_Chooser::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Color_Chooser) this);+    }+    else {+      Fl_Color_Chooser::draw();+    }+  }++  void Fl_DerivedColor_Chooser::draw_super(){+    Fl_Color_Chooser::draw();+  }++  int Fl_DerivedColor_Chooser::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Color_Chooser) this,event);+    }+    else {+      i = Fl_Color_Chooser::handle(event);+    }+    return i;+  }+  int Fl_DerivedColor_Chooser::handle_super(int event){+    return Fl_Color_Chooser::handle(event);+  }++  void Fl_DerivedColor_Chooser::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Color_Chooser) this,x,y,w,h);+    }+    else {+      Fl_Color_Chooser::resize(x,y,w,h);+    }+  }++  void Fl_DerivedColor_Chooser::resize_super(int x, int y, int w, int h){+    Fl_Color_Chooser::resize(x,y,w,h);+  }+  void Fl_DerivedColor_Chooser::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Color_Chooser) this);+    }+    else {+      Fl_Color_Chooser::show();+    }+  }+  void Fl_DerivedColor_Chooser::show_super(){+    Fl_Color_Chooser::show();+  }++  void Fl_DerivedColor_Chooser::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Color_Chooser) this);+    }+    else {+      Fl_Color_Chooser::hide();+    }+  }+  void Fl_DerivedColor_Chooser::hide_super(){+    Fl_Color_Chooser::hide();+  }++ #endif   FL_EXPORT_C(int,Fl_Color_Chooser_handle)(fl_Color_Chooser color_chooser, int event){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->handle(event);+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->handle(event);   }   FL_EXPORT_C(fl_Group,Fl_Color_Chooser_parent)(fl_Color_Chooser color_chooser){-    return (fl_Group) (static_cast<Fl_Color_Chooser*>(color_chooser))->parent();+    return (fl_Group) (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->parent();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_parent)(fl_Color_Chooser color_chooser,fl_Group grp){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->parent((static_cast<Fl_Color_Chooser*>(grp)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->parent((static_cast<Fl_DerivedColor_Chooser*>(grp)));   }   FL_EXPORT_C(uchar,Fl_Color_Chooser_type)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->type();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->type();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_type)(fl_Color_Chooser color_chooser,uchar t){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->type(t);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->type(t);   }    FL_EXPORT_C(int,Fl_Color_Chooser_x)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->x();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->x();   }   FL_EXPORT_C(int,Fl_Color_Chooser_y)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->y();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->y();   }   FL_EXPORT_C(int,Fl_Color_Chooser_w)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->w();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->w();   }   FL_EXPORT_C(int,Fl_Color_Chooser_h)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->h();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->h();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_align)(fl_Color_Chooser color_chooser, Fl_Align alignment){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->align(alignment);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->align(alignment);   }   FL_EXPORT_C(Fl_Align,Fl_Color_Chooser_align)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->align();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->align();   }   FL_EXPORT_C(Fl_Boxtype,Fl_Color_Chooser_box)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->box();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->box();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_box)(fl_Color_Chooser color_chooser,Fl_Boxtype new_box){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->box((static_cast<Fl_Boxtype>(new_box)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->box((static_cast<Fl_Boxtype>(new_box)));   }   FL_EXPORT_C(Fl_Color,Fl_Color_Chooser_color)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->color();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->color();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_color)(fl_Color_Chooser color_chooser,Fl_Color bg){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->color(bg);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->color(bg);   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_color_with_bg_sel)(fl_Color_Chooser color_chooser,Fl_Color bg,Fl_Color a){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->color(bg,a);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->color(bg,a);   }   FL_EXPORT_C(Fl_Color,Fl_Color_Chooser_selection_color)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->selection_color();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->selection_color();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_selection_color)(fl_Color_Chooser color_chooser,Fl_Color a){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->selection_color(a);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->selection_color(a);   }   FL_EXPORT_C(const char*,Fl_Color_Chooser_label)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->label();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->label();   }   FL_EXPORT_C(void,Fl_Color_Chooser_copy_label)(fl_Color_Chooser color_chooser,const char* new_label){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->copy_label(new_label);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->copy_label(new_label);   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_label)(fl_Color_Chooser color_chooser,const char* text){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->label(text);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->label(text);   }   FL_EXPORT_C(Fl_Labeltype,Fl_Color_Chooser_labeltype)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->labeltype();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labeltype();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_labeltype)(fl_Color_Chooser color_chooser,Fl_Labeltype a){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->labeltype(a);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labeltype(a);   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_labelcolor)(fl_Color_Chooser color_chooser,Fl_Color c){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->labelcolor(c);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labelcolor(c);   }   FL_EXPORT_C(Fl_Font,Fl_Color_Chooser_labelfont)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->labelfont();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labelfont();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_labelfont)(fl_Color_Chooser color_chooser,Fl_Font c){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->labelfont((static_cast<Fl_Font>(c)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labelfont((static_cast<Fl_Font>(c)));   }   FL_EXPORT_C(Fl_Fontsize,Fl_Color_Chooser_labelsize)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->labelsize();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labelsize();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_labelsize)(fl_Color_Chooser color_chooser,Fl_Fontsize pix){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->labelsize((static_cast<Fl_Fontsize>(pix)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->labelsize((static_cast<Fl_Fontsize>(pix)));   }   FL_EXPORT_C(fl_Image,Fl_Color_Chooser_image)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->image();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->image();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_image)(fl_Color_Chooser color_chooser,fl_Image pix){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->image((static_cast<Fl_Image*>(pix)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->image((static_cast<Fl_Image*>(pix)));   }   FL_EXPORT_C(fl_Image,Fl_Color_Chooser_deimage)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->deimage();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->deimage();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_deimage)(fl_Color_Chooser color_chooser,fl_Image pix){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->deimage((static_cast<Fl_Image*>(pix)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->deimage((static_cast<Fl_Image*>(pix)));   }   FL_EXPORT_C(const char*,Fl_Color_Chooser_tooltip)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->tooltip();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->tooltip();   }   FL_EXPORT_C(void,Fl_Color_Chooser_copy_tooltip)(fl_Color_Chooser color_chooser,const char* text){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->copy_tooltip(text);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->copy_tooltip(text);   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_tooltip)(fl_Color_Chooser color_chooser,const char* text){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->tooltip(text);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->tooltip(text);   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_callback_with_user_data)(fl_Color_Chooser color_chooser,fl_Callback* cb,void* p){-    Fl_Color_Chooser* castedWindow = (static_cast<Fl_Color_Chooser*>(color_chooser));+    Fl_Color_Chooser* castedWindow = (static_cast<Fl_DerivedColor_Chooser*>(color_chooser));     new C_to_Fl_Callback(castedWindow, cb, p);   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_callback)(fl_Color_Chooser color_chooser,fl_Callback* cb){-    Fl_Color_Chooser* castedWindow = (static_cast<Fl_Color_Chooser*>(color_chooser));+    Fl_Color_Chooser* castedWindow = (static_cast<Fl_DerivedColor_Chooser*>(color_chooser));     new C_to_Fl_Callback(castedWindow, cb);   }   FL_EXPORT_C(void*,Fl_Color_Chooser_user_data)(fl_Color_Chooser color_chooser){-    C_to_Fl_Callback* stored_cb = (static_cast<C_to_Fl_Callback*>((static_cast<Fl_Color_Chooser*>(color_chooser))->user_data()));+    C_to_Fl_Callback* stored_cb = (static_cast<C_to_Fl_Callback*>((static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->user_data()));     if(stored_cb){       return stored_cb->get_user_data();     }     else {-      return (static_cast<Fl_Color_Chooser*>(color_chooser))->user_data();+      return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->user_data();     }   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_user_data)(fl_Color_Chooser color_chooser,void* v){-    C_to_Fl_Callback* stored_cb = (static_cast<C_to_Fl_Callback*>((static_cast<Fl_Color_Chooser*>(color_chooser))->user_data()));+    C_to_Fl_Callback* stored_cb = (static_cast<C_to_Fl_Callback*>((static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->user_data()));     if (stored_cb) {       stored_cb->set_user_data(v);-      (static_cast<Fl_Color_Chooser*>(color_chooser))->user_data(stored_cb);+      (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->user_data(stored_cb);     }     else {-      (static_cast<Fl_Color_Chooser*>(color_chooser))->user_data(v);+      (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->user_data(v);     }   }   FL_EXPORT_C(long,Fl_Color_Chooser_argument)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->argument();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->argument();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_argument)(fl_Color_Chooser color_chooser,long v){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->argument(v);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->argument(v);   }   FL_EXPORT_C(Fl_When,Fl_Color_Chooser_when)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->when();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->when();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_when)(fl_Color_Chooser color_chooser,uchar i){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->when(i);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->when(i);   }   FL_EXPORT_C(unsigned int,Fl_Color_Chooser_visible)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->visible();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->visible();   }   FL_EXPORT_C(int,Fl_Color_Chooser_visible_r)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->visible_r();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->visible_r();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_visible)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->visible();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->visible();   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear_visible)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear_visible();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear_visible();   }   FL_EXPORT_C(unsigned int,Fl_Color_Chooser_active)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->active();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->active();   }   FL_EXPORT_C(int,Fl_Color_Chooser_active_r)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->active_r();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->active_r();   }   FL_EXPORT_C(void,Fl_Color_Chooser_activate)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->activate();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->activate();   }   FL_EXPORT_C(void,Fl_Color_Chooser_deactivate)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->deactivate();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->deactivate();   }   FL_EXPORT_C(unsigned int,Fl_Color_Chooser_output)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->output();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->output();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_output)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->output();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->output();   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear_output)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear_output();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear_output();   }   FL_EXPORT_C(unsigned int,Fl_Color_Chooser_takesevents)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->takesevents();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->takesevents();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_changed)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->changed();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->changed();   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear_changed)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear_changed();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear_changed();   }   FL_EXPORT_C(int,Fl_Color_Chooser_take_focus)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->take_focus();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->take_focus();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_visible_focus)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->set_visible_focus();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->set_visible_focus();   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear_visible_focus)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear_visible_focus();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear_visible_focus();   }   FL_EXPORT_C(void,Fl_Color_Chooser_modify_visible_focus)(fl_Color_Chooser color_chooser,int v){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->visible_focus(v);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->visible_focus(v);   }   FL_EXPORT_C(unsigned int,Fl_Color_Chooser_visible_focus)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->visible_focus();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->visible_focus();   }   FL_EXPORT_C(void,Fl_Color_Chooser_do_callback)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->do_callback();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->do_callback();   }   FL_EXPORT_C(void,Fl_Color_Chooser_do_callback_with_widget_and_user_data)(fl_Color_Chooser color_chooser,fl_Widget w,long arg){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->do_callback((static_cast<Fl_Widget*>(w)),arg);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->do_callback((static_cast<Fl_Widget*>(w)),arg);   }   FL_EXPORT_C(void,Fl_Color_Chooser_do_callback_with_widget_and_default_user_data)(fl_Color_Chooser color_chooser,fl_Widget w){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->do_callback((static_cast<Fl_Widget*>(w)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->do_callback((static_cast<Fl_Widget*>(w)));   }   FL_EXPORT_C(int,Fl_Color_Chooser_contains)(fl_Color_Chooser color_chooser,fl_Widget w){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->contains((static_cast<Fl_Widget*>(w)));+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->contains((static_cast<Fl_Widget*>(w)));   }   FL_EXPORT_C(int,Fl_Color_Chooser_inside)(fl_Color_Chooser color_chooser,fl_Widget w){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->inside((static_cast<Fl_Widget*>(w)));+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->inside((static_cast<Fl_Widget*>(w)));   }   FL_EXPORT_C(void,Fl_Color_Chooser_redraw)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->redraw();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->redraw();   }   FL_EXPORT_C(void,Fl_Color_Chooser_redraw_label)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->redraw_label();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->redraw_label();   }   FL_EXPORT_C(uchar,Fl_Color_Chooser_damage)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->damage();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->damage();   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear_damage_with_bitmask)(fl_Color_Chooser color_chooser,uchar c){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear_damage(c);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear_damage(c);   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear_damage)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear_damage();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear_damage();   }   FL_EXPORT_C(void,Fl_Color_Chooser_damage_with_text)(fl_Color_Chooser color_chooser,uchar c){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->damage(c);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->damage(c);   }   FL_EXPORT_C(void,Fl_Color_Chooser_damage_inside_widget)(fl_Color_Chooser color_chooser,uchar c,int x,int y,int w,int h){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->damage(c,x,y,w,h);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->damage(c,x,y,w,h);   }   FL_EXPORT_C(void,Fl_Color_Chooser_draw_label_with_xywh_alignment)(fl_Color_Chooser color_chooser,int x,int y,int w,int h,Fl_Align alignment){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->draw_label(x,y,w,h,alignment);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->draw_label(x,y,w,h,alignment);   }   FL_EXPORT_C(void,Fl_Color_Chooser_measure_label)(fl_Color_Chooser color_chooser,int* ww,int* hh){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->measure_label(*ww,*hh);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->measure_label(*ww,*hh);   }   FL_EXPORT_C(fl_Window,    Fl_Color_Chooser_window)(fl_Color_Chooser color_chooser){-    return (fl_Window) (static_cast<Fl_Color_Chooser*>(color_chooser))->window();+    return (fl_Window) (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->window();   }   FL_EXPORT_C(fl_Window,    Fl_Color_Chooser_top_window)(fl_Color_Chooser color_chooser){-    return (fl_Window) (static_cast<Fl_Color_Chooser*>(color_chooser))->top_window();+    return (fl_Window) (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->top_window();   }   FL_EXPORT_C(fl_Window ,   Fl_Color_Chooser_top_window_offset)(fl_Color_Chooser color_chooser, int* xoff, int* yoff){-    return (fl_Window) (static_cast<Fl_Color_Chooser*>(color_chooser))->top_window_offset(*xoff,*yoff);+    return (fl_Window) (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->top_window_offset(*xoff,*yoff);   }   FL_EXPORT_C(fl_Group,Fl_Color_Chooser_as_group)(fl_Color_Chooser color_chooser){-    return (fl_Group) (static_cast<Fl_Color_Chooser*>(color_chooser))->as_group();+    return (fl_Group) (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->as_group();   }   FL_EXPORT_C(fl_Gl_Window,Fl_Color_Chooser_as_gl_window)(fl_Color_Chooser color_chooser){-    return (fl_Gl_Window) (static_cast<Fl_Color_Chooser*>(color_chooser))->as_gl_window();+    return (fl_Gl_Window) (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->as_gl_window();   }    FL_EXPORT_C(void,Fl_Color_Chooser_begin)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->begin();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->begin();   }   FL_EXPORT_C(void,Fl_Color_Chooser_end)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->end();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->end();   }   FL_EXPORT_C(int,Fl_Color_Chooser_find)(fl_Color_Chooser color_chooser,fl_Widget w){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->find(static_cast<Fl_Widget*>(w));+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->find(static_cast<Fl_Widget*>(w));   }   FL_EXPORT_C(void,Fl_Color_Chooser_add)(fl_Color_Chooser color_chooser,fl_Widget w){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->add((static_cast<Fl_Widget*>(w)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->add((static_cast<Fl_Widget*>(w)));   }   FL_EXPORT_C(void,Fl_Color_Chooser_insert)(fl_Color_Chooser color_chooser,fl_Widget w,int i){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->insert(*(static_cast<Fl_Widget*>(w)),i);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->insert(*(static_cast<Fl_Widget*>(w)),i);   }   FL_EXPORT_C(void,Fl_Color_Chooser_remove_index)(fl_Color_Chooser color_chooser,int index){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->remove(index);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->remove(index);   }   FL_EXPORT_C(void,Fl_Color_Chooser_remove_widget)(fl_Color_Chooser color_chooser,fl_Widget w){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->remove((static_cast<Fl_Widget*>(w)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->remove((static_cast<Fl_Widget*>(w)));   }   FL_EXPORT_C(void,Fl_Color_Chooser_clear)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->clear();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clear();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_resizable_by_reference)(fl_Color_Chooser color_chooser,fl_Widget o){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->resizable((static_cast<Fl_Widget*>(o)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->resizable((static_cast<Fl_Widget*>(o)));   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_resizable)(fl_Color_Chooser color_chooser,fl_Widget o){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->resizable((static_cast<Fl_Widget*>(o)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->resizable((static_cast<Fl_Widget*>(o)));   }   FL_EXPORT_C(fl_Widget,Fl_Color_Chooser_resizable)(fl_Color_Chooser color_chooser){-    return (fl_Widget)(static_cast<Fl_Color_Chooser*>(color_chooser))->resizable();+    return (fl_Widget)(static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->resizable();   }   FL_EXPORT_C(void,Fl_Color_Chooser_add_resizable)(fl_Color_Chooser color_chooser,fl_Widget o){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->add_resizable(*(static_cast<Fl_Widget*>(o)));+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->add_resizable(*(static_cast<Fl_Widget*>(o)));   }   FL_EXPORT_C(void,Fl_Color_Chooser_init_sizes)(fl_Color_Chooser color_chooser){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->init_sizes();+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->init_sizes();   }   FL_EXPORT_C(int,Fl_Color_Chooser_children)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->children();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->children();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_clip_children)(fl_Color_Chooser color_chooser,int c){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->clip_children(c);+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clip_children(c);   }   FL_EXPORT_C(unsigned int,Fl_Color_Chooser_clip_children)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->clip_children();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->clip_children();   }   FL_EXPORT_C(void,Fl_Color_Chooser_focus)(fl_Color_Chooser color_chooser, fl_Widget W){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->focus((static_cast<Fl_Widget*>(W)));+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->focus((static_cast<Fl_Widget*>(W)));   }   FL_EXPORT_C(fl_Widget,Fl_Color_Chooser__ddfdesign_kludge)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->_ddfdesign_kludge();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->_ddfdesign_kludge();   }   FL_EXPORT_C(void, Fl_Color_Chooser_insert_with_before)(fl_Color_Chooser color_chooser, fl_Widget w, fl_Widget before){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->insert(*(static_cast<Fl_Widget*>(w)),(static_cast<Fl_Widget*>(before)));+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->insert(*(static_cast<Fl_Widget*>(w)),(static_cast<Fl_Widget*>(before)));   }   FL_EXPORT_C(fl_Widget*, Fl_Color_Chooser_array)(fl_Color_Chooser color_chooser){-    return (fl_Widget*)(static_cast<Fl_Color_Chooser*>(color_chooser))->array();+    return (fl_Widget*)(static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->array();   }   FL_EXPORT_C(fl_Widget, Fl_Color_Chooser_child)(fl_Color_Chooser color_chooser, int n){-    return (fl_Widget)(static_cast<Fl_Color_Chooser*>(color_chooser))->child(n);+    return (fl_Widget)(static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->child(n);   }-  FL_EXPORT_C(fl_Color_Chooser,     Fl_Color_Chooser_New)(int x, int y, int w, int h){-    Fl_Color_Chooser* g = new Fl_Color_Chooser(x,y,w,h);-    return (fl_Color_Chooser)g;+  FL_EXPORT_C(fl_Color_Chooser,    Fl_Color_Chooser_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedColor_Chooser* w = new Fl_DerivedColor_Chooser(X,Y,W,H,fs);+    return (fl_Color_Chooser)w;   }-  FL_EXPORT_C(fl_Color_Chooser,     Fl_Color_Chooser_New_WithLabel)(int x, int y, int w, int h, const char* t){-    Fl_Color_Chooser* g = new Fl_Color_Chooser(x,y,w,h,t);-    return (fl_Color_Chooser)g;+  FL_EXPORT_C(fl_Color_Chooser,    Fl_Color_Chooser_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedColor_Chooser* w = new Fl_DerivedColor_Chooser(X,Y,W,H,label,fs);+    return (fl_Color_Chooser)w;   }+  FL_EXPORT_C(fl_Color_Chooser,    Fl_OverriddenColor_Chooser_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedColor_Chooser* w = new Fl_DerivedColor_Chooser(X,Y,W,H,fs);+    return (fl_Color_Chooser)w;+  }+  FL_EXPORT_C(fl_Color_Chooser,    Fl_OverriddenColor_Chooser_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedColor_Chooser* w = new Fl_DerivedColor_Chooser(X,Y,W,H,label,fs);+    return (fl_Color_Chooser)w;+  }+   FL_EXPORT_C(int,Fl_Color_Chooser_mode)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->mode();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->mode();   }   FL_EXPORT_C(void,Fl_Color_Chooser_set_mode)(fl_Color_Chooser color_chooser,int newMode){-    (static_cast<Fl_Color_Chooser*>(color_chooser))->mode(newMode);+    (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->mode(newMode);   }   FL_EXPORT_C(double,Fl_Color_Chooser_hue)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->hue();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->hue();   }   FL_EXPORT_C(double,Fl_Color_Chooser_saturation)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->saturation();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->saturation();   }   FL_EXPORT_C(double,Fl_Color_Chooser_value)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->value();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->value();   }   FL_EXPORT_C(double,Fl_Color_Chooser_r)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->r();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->r();   }   FL_EXPORT_C(double,Fl_Color_Chooser_g)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->g();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->g();   }   FL_EXPORT_C(double,Fl_Color_Chooser_b)(fl_Color_Chooser color_chooser){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->b();+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->b();   }   FL_EXPORT_C(int,Fl_Color_Chooser_hsv)(fl_Color_Chooser color_chooser,double H,double S,double V){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->hsv(H,S,V);+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->hsv(H,S,V);   }   FL_EXPORT_C(int,Fl_Color_Chooser_rgb)(fl_Color_Chooser color_chooser,double R,double G,double B){-    return (static_cast<Fl_Color_Chooser*>(color_chooser))->rgb(R,G,B);+    return (static_cast<Fl_DerivedColor_Chooser*>(color_chooser))->rgb(R,G,B);   }   FL_EXPORT_C(void,Fl_Color_Chooser_hsv2rgb)(double H,double S,double V,double* R,double* G,double* B){     Fl_Color_Chooser::hsv2rgb(H,S,V,*R,*G,*B);@@ -380,6 +466,33 @@   }   FL_EXPORT_C(int, flc_color_chooser_with_uchar_m)(const char* name, uchar* r, uchar* g, uchar* b, int m){     return fl_color_chooser(name,*r,*g,*b,m);+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_draw)(fl_Color_Chooser o){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_draw_super)(fl_Color_Chooser o){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Color_Chooser_handle_super)(fl_Color_Chooser o, int event){+    return (static_cast<Fl_DerivedColor_Chooser*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_resize)(fl_Color_Chooser o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_resize_super)(fl_Color_Chooser o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_show)(fl_Color_Chooser o){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_show_super)(fl_Color_Chooser o){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_hide)(fl_Color_Chooser o){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Color_Chooser_hide_super)(fl_Color_Chooser o){+    (static_cast<Fl_DerivedColor_Chooser*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Color_Chooser.H" #include "Fl_CallbackC.h"+#include "Fl_GroupC.h" EXPORT {+  class Fl_DerivedColor_Chooser : public Fl_Color_Chooser {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedColor_Chooser(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedColor_Chooser(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedColor_Chooser();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,          Fl_Color_Chooser_handle)(fl_Color_Chooser color_chooser, int event);@@ -139,9 +158,26 @@   FL_EXPORT_C(fl_Color_Chooser,Fl_Color_Chooser_New)(int x, int y, int w, int h);   FL_EXPORT_C(fl_Color_Chooser,Fl_Color_Chooser_New_WithLabel)(int x, int y, int w, int h, const char* t);   FL_EXPORT_C(int, flc_color_chooser)(const char* name, double* r, double* g, double* b);+  FL_EXPORT_C(fl_Color_Chooser,    Fl_Color_Chooser_New)(int X, int Y, int W, int H);+  FL_EXPORT_C(fl_Color_Chooser,    Fl_Color_Chooser_New_WithLabel)(int X, int Y, int W, int H, const char* label);+  FL_EXPORT_C(fl_Color_Chooser,    Fl_OverriddenColor_Chooser_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Color_Chooser,    Fl_OverriddenColor_Chooser_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+   FL_EXPORT_C(int, flc_color_chooser_with_m)(const char* name, double* r, double* g, double* b, int m);   FL_EXPORT_C(int, flc_color_chooser_with_uchar)(const char* name, uchar* r, uchar* g, uchar* b);   FL_EXPORT_C(int, flc_color_chooser_with_uchar_m)(const char* name, uchar* r, uchar* g, uchar* b, int m);+  FL_EXPORT_C(void, Fl_Color_Chooser_draw)(fl_Color_Chooser o);+  FL_EXPORT_C(void, Fl_Color_Chooser_draw_super)(fl_Color_Chooser o);+  FL_EXPORT_C(int, Fl_Color_Chooser_handle)(fl_Color_Chooser o, int event);+  FL_EXPORT_C(int, Fl_Color_Chooser_handle_super)(fl_Color_Chooser o, int event);+  FL_EXPORT_C(void, Fl_Color_Chooser_resize)(fl_Color_Chooser o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Color_Chooser_resize_super)(fl_Color_Chooser o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Color_Chooser_show)(fl_Color_Chooser o);+  FL_EXPORT_C(void, Fl_Color_Chooser_show_super)(fl_Color_Chooser o);+  FL_EXPORT_C(void, Fl_Color_Chooser_hide)(fl_Color_Chooser o);+  FL_EXPORT_C(void, Fl_Color_Chooser_hide_super)(fl_Color_Chooser o);++ #ifdef __cplusplus } #endif

@@ -1,7 +1,82 @@ #include "Fl_CounterC.h" #ifdef __cplusplus EXPORT {-#endif  +  Fl_DerivedCounter::Fl_DerivedCounter(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Counter(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedCounter::Fl_DerivedCounter(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Counter(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedCounter::~Fl_DerivedCounter(){+    free(overriddenFuncs);+  }+  void Fl_DerivedCounter::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Counter) this);+    }+    else {+      Fl_Counter::draw();+    }+  }++  void Fl_DerivedCounter::draw_super(){+    Fl_Counter::draw();+  }++  int Fl_DerivedCounter::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Counter) this,event);+    }+    else {+      i = Fl_Counter::handle(event);+    }+    return i;+  }+  int Fl_DerivedCounter::handle_super(int event){+    return Fl_Counter::handle(event);+  }++  void Fl_DerivedCounter::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Counter) this,x,y,w,h);+    }+    else {+      Fl_Counter::resize(x,y,w,h);+    }+  }++  void Fl_DerivedCounter::resize_super(int x, int y, int w, int h){+    Fl_Counter::resize(x,y,w,h);+  }+  void Fl_DerivedCounter::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Counter) this);+    }+    else {+      Fl_Counter::show();+    }+  }+  void Fl_DerivedCounter::show_super(){+    Fl_Counter::show();+  }++  void Fl_DerivedCounter::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Counter) this);+    }+    else {+      Fl_Counter::hide();+    }+  }+  void Fl_DerivedCounter::hide_super(){+    Fl_Counter::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Counter_parent)(fl_Counter counter){     return (static_cast<Fl_Counter*>(counter))->parent();   }@@ -152,12 +227,6 @@   FL_EXPORT_C(int,Fl_Counter_visible_r)(fl_Counter counter){     return (static_cast<Fl_Counter*>(counter))->visible_r();   }-  FL_EXPORT_C(void,Fl_Counter_show)(fl_Counter counter){-    (static_cast<Fl_Counter*>(counter))->show();-  }-  FL_EXPORT_C(void,Fl_Counter_hide)(fl_Counter counter){-    (static_cast<Fl_Counter*>(counter))->hide();-  }   FL_EXPORT_C(void,Fl_Counter_set_visible)(fl_Counter counter){     (static_cast<Fl_Counter*>(counter))->visible();   }@@ -254,9 +323,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Counter_as_gl_window)(fl_Counter counter){     return (static_cast<Fl_Counter*>(counter))->as_gl_window();   }-  FL_EXPORT_C(void,Fl_Counter_resize)(fl_Counter counter,int X,int Y,int W,int H){-    (static_cast<Fl_Counter*>(counter))->resize(X,Y,W,H);-  }   FL_EXPORT_C(void,Fl_Counter_bounds)(fl_Counter counter,double a,double b){     (static_cast<Fl_Counter*>(counter))->bounds(a,b);   }@@ -308,14 +374,6 @@   FL_EXPORT_C(double,Fl_Counter_increment)(fl_Counter counter,double v,int n){     return (static_cast<Fl_Counter*>(counter))->increment(v,n);   }-  FL_EXPORT_C(fl_Counter,Fl_Counter_New_WithLabel)(int x,int y,int w,int h,const char* label){-    Fl_Counter* counter = new Fl_Counter(x,y,w,h,label);-    return (fl_Counter) counter;-  }-  FL_EXPORT_C(fl_Counter,Fl_Counter_New)(int x,int y,int w,int h){-    Fl_Counter* counter = new Fl_Counter(x,y,w,h);-    return (fl_Counter) counter;-  }   FL_EXPORT_C(fl_Simple_Counter,Fl_Simple_Counter_New_WithLabel)(int x,int y,int w,int h,const char* label){     Fl_Simple_Counter* simple_counter = new Fl_Simple_Counter(x,y,w,h,label);     return (fl_Simple_Counter) simple_counter;@@ -345,12 +403,57 @@   FL_EXPORT_C(Fl_Color,Fl_Counter_textcolor)(fl_Counter counter){     return (static_cast<Fl_Counter*>(counter))->textcolor();   }-  FL_EXPORT_C(int,Fl_Counter_handle)(fl_Counter counter,int event){-    return (static_cast<Fl_Counter*>(counter))->handle(event);-  }   FL_EXPORT_C(void,Fl_Counter_lstep)(fl_Counter counter,double lstep){     (static_cast<Fl_Counter*>(counter))->lstep(lstep);   }+  FL_EXPORT_C(void, Fl_Counter_draw)(fl_Counter o){+    (static_cast<Fl_DerivedCounter*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Counter_draw_super)(fl_Counter o){+    (static_cast<Fl_DerivedCounter*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Counter_handle)(fl_Counter o, int event){+    return (static_cast<Fl_DerivedCounter*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Counter_handle_super)(fl_Counter o, int event){+    return (static_cast<Fl_DerivedCounter*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Counter_resize)(fl_Counter o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedCounter*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Counter_resize_super)(fl_Counter o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedCounter*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Counter_show)(fl_Counter o){+    (static_cast<Fl_DerivedCounter*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Counter_show_super)(fl_Counter o){+    (static_cast<Fl_DerivedCounter*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Counter_hide)(fl_Counter o){+    (static_cast<Fl_DerivedCounter*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Counter_hide_super)(fl_Counter o){+    (static_cast<Fl_DerivedCounter*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Counter,    Fl_Counter_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedCounter* w = new Fl_DerivedCounter(X,Y,W,H,fs);+    return (fl_Counter)w;+  }+  FL_EXPORT_C(fl_Counter,    Fl_Counter_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedCounter* w = new Fl_DerivedCounter(X,Y,W,H,label,fs);+    return (fl_Counter)w;+  }+  FL_EXPORT_C(fl_Counter,    Fl_OverriddenCounter_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedCounter* w = new Fl_DerivedCounter(X,Y,W,H,fs);+    return (fl_Counter)w;+  }+  FL_EXPORT_C(fl_Counter,    Fl_OverriddenCounter_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedCounter* w = new Fl_DerivedCounter(X,Y,W,H,label,fs);+    return (fl_Counter)w;+  } #ifdef __cplusplus }-#endif +#endif

@@ -8,7 +8,26 @@ #include "FL/Fl_Counter.H" #include "FL/Fl_Simple_Counter.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedCounter : public Fl_Counter {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedCounter(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedCounter(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedCounter();+  }; #endif #ifndef INTERNAL_LINKAGE   typedef enum Counter_Type {@@ -133,6 +152,19 @@   FL_EXPORT_C(Fl_Fontsize,     Fl_Counter_textsize)(fl_Counter counter);   FL_EXPORT_C(void,         Fl_Counter_set_textcolor)(fl_Counter counter, Fl_Color text);   FL_EXPORT_C(Fl_Color,     Fl_Counter_textcolor)(fl_Counter counter);+  FL_EXPORT_C(fl_Counter,    Fl_OverriddenCounter_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Counter,    Fl_OverriddenCounter_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Counter_draw)(fl_Counter o);+  FL_EXPORT_C(void, Fl_Counter_draw_super)(fl_Counter o);+  FL_EXPORT_C(int, Fl_Counter_handle)(fl_Counter o, int event);+  FL_EXPORT_C(int, Fl_Counter_handle_super)(fl_Counter o, int event);+  FL_EXPORT_C(void, Fl_Counter_resize)(fl_Counter o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Counter_resize_super)(fl_Counter o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Counter_show)(fl_Counter o);+  FL_EXPORT_C(void, Fl_Counter_show_super)(fl_Counter o);+  FL_EXPORT_C(void, Fl_Counter_hide)(fl_Counter o);+  FL_EXPORT_C(void, Fl_Counter_hide_super)(fl_Counter o);+ #ifdef __cplusplus } #endif

@@ -1,7 +1,80 @@ #include "Fl_DialC.h" #ifdef __cplusplus EXPORT {-#endif  +  Fl_DerivedDial::Fl_DerivedDial(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Dial(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedDial::Fl_DerivedDial(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Dial(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedDial::~Fl_DerivedDial(){+    free(overriddenFuncs);+  }+  void Fl_DerivedDial::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Dial) this);+    }+    else {+      Fl_Dial::draw();+    }+  }++  void Fl_DerivedDial::draw_super(){+    Fl_Dial::draw();+  }++  int Fl_DerivedDial::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Dial) this,event);+    }+    else {+      i = Fl_Dial::handle(event);+    }+    return i;+  }+  int Fl_DerivedDial::handle_super(int event){+    return Fl_Dial::handle(event);+  }++  void Fl_DerivedDial::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Dial) this,x,y,w,h);+    }+    else {+      Fl_Dial::resize(x,y,w,h);+    }+  }++  void Fl_DerivedDial::resize_super(int x, int y, int w, int h){+    Fl_Dial::resize(x,y,w,h);+  }+  void Fl_DerivedDial::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Dial) this);+    }+    else {+      Fl_Dial::show();+    }+  }+  void Fl_DerivedDial::show_super(){+    Fl_Dial::show();+  }++  void Fl_DerivedDial::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Dial) this);+    }+    else {+      Fl_Dial::hide();+    }+  }+  void Fl_DerivedDial::hide_super(){+    Fl_Dial::hide();+  }+#endif   FL_EXPORT_C(fl_Group,Fl_Dial_parent)(fl_Dial dial){     return (static_cast<Fl_Dial*>(dial))->parent();   }@@ -152,12 +225,6 @@   FL_EXPORT_C(int,Fl_Dial_visible_r)(fl_Dial dial){     return (static_cast<Fl_Dial*>(dial))->visible_r();   }-  FL_EXPORT_C(void,Fl_Dial_show)(fl_Dial dial){-    (static_cast<Fl_Dial*>(dial))->show();-  }-  FL_EXPORT_C(void,Fl_Dial_hide)(fl_Dial dial){-    (static_cast<Fl_Dial*>(dial))->hide();-  }   FL_EXPORT_C(void,Fl_Dial_set_visible)(fl_Dial dial){     (static_cast<Fl_Dial*>(dial))->visible();   }@@ -254,9 +321,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Dial_as_gl_window)(fl_Dial dial){     return (static_cast<Fl_Dial*>(dial))->as_gl_window();   }-  FL_EXPORT_C(void,Fl_Dial_resize)(fl_Dial dial,int X,int Y,int W,int H){-    (static_cast<Fl_Dial*>(dial))->resize(X,Y,W,H);-  }   FL_EXPORT_C(void,Fl_Dial_bounds)(fl_Dial dial,double a,double b){     (static_cast<Fl_Dial*>(dial))->bounds(a,b);   }@@ -308,14 +372,6 @@   FL_EXPORT_C(double,Fl_Dial_increment)(fl_Dial dial,double v,int n){     return (static_cast<Fl_Dial*>(dial))->increment(v,n);   }-  FL_EXPORT_C(fl_Dial,Fl_Dial_New_WithLabel)(int x,int y,int w,int h,const char* label){-    Fl_Dial* dial = new Fl_Dial(x,y,w,h,label);-    return (fl_Dial) dial;-  }-  FL_EXPORT_C(fl_Dial,Fl_Dial_New)(int x,int y,int w,int h){-    Fl_Dial* dial = new Fl_Dial(x,y,w,h);-    return (fl_Dial) dial;-  }   FL_EXPORT_C(fl_Fill_Dial,Fl_Fill_Dial_New)(int x,int y,int w,int h,const char* label){     Fl_Fill_Dial* dial = new Fl_Fill_Dial(x,y,w,h,label);     return (fl_Fill_Dial) dial;@@ -343,9 +399,54 @@   FL_EXPORT_C(short,Fl_Dial_angle2)(fl_Dial dial){     return (static_cast<Fl_Dial*>(dial))->angle2();   }-  FL_EXPORT_C(int,Fl_Dial_handle)(fl_Dial dial,int event){-    return (static_cast<Fl_Dial*>(dial))->handle(event);+  FL_EXPORT_C(void, Fl_Dial_draw)(fl_Dial o){+    (static_cast<Fl_DerivedDial*>(o))->draw();   }+  FL_EXPORT_C(void, Fl_Dial_draw_super)(fl_Dial o){+    (static_cast<Fl_DerivedDial*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Dial_handle)(fl_Dial o, int event){+    return (static_cast<Fl_DerivedDial*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Dial_handle_super)(fl_Dial o, int event){+    return (static_cast<Fl_DerivedDial*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Dial_resize)(fl_Dial o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedDial*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Dial_resize_super)(fl_Dial o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedDial*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Dial_show)(fl_Dial o){+    (static_cast<Fl_DerivedDial*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Dial_show_super)(fl_Dial o){+    (static_cast<Fl_DerivedDial*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Dial_hide)(fl_Dial o){+    (static_cast<Fl_DerivedDial*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Dial_hide_super)(fl_Dial o){+    (static_cast<Fl_DerivedDial*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Dial,    Fl_Dial_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedDial* w = new Fl_DerivedDial(X,Y,W,H,fs);+    return (fl_Dial)w;+  }+  FL_EXPORT_C(fl_Dial,    Fl_Dial_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedDial* w = new Fl_DerivedDial(X,Y,W,H,label,fs);+    return (fl_Dial)w;+  }+  FL_EXPORT_C(fl_Dial,    Fl_OverriddenDial_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedDial* w = new Fl_DerivedDial(X,Y,W,H,fs);+    return (fl_Dial)w;+  }+  FL_EXPORT_C(fl_Dial,    Fl_OverriddenDial_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedDial* w = new Fl_DerivedDial(X,Y,W,H,label,fs);+    return (fl_Dial)w;+  } #ifdef __cplusplus }-#endif +#endif

@@ -9,7 +9,26 @@ #include "FL/Fl_Fill_Dial.H" #include "FL/Fl_Line_Dial.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedDial : public Fl_Dial {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedDial(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedDial(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedDial();+  }; #endif #ifndef INTERNAL_LINKAGE   typedef enum Dial_Type {@@ -134,6 +153,18 @@   FL_EXPORT_C(short,     Fl_Dial_angle1)(fl_Dial dial);   FL_EXPORT_C(short,     Fl_Dial_angle2)(fl_Dial dial);   FL_EXPORT_C(int,       Fl_Dial_handle)(fl_Dial dial, int event);+  FL_EXPORT_C(fl_Dial,    Fl_OverriddenDial_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Dial,    Fl_OverriddenDial_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Dial_draw)(fl_Dial o);+  FL_EXPORT_C(void, Fl_Dial_draw_super)(fl_Dial o);+  FL_EXPORT_C(int, Fl_Dial_handle)(fl_Dial o, int event);+  FL_EXPORT_C(int, Fl_Dial_handle_super)(fl_Dial o, int event);+  FL_EXPORT_C(void, Fl_Dial_resize)(fl_Dial o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Dial_resize_super)(fl_Dial o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Dial_show)(fl_Dial o);+  FL_EXPORT_C(void, Fl_Dial_show_super)(fl_Dial o);+  FL_EXPORT_C(void, Fl_Dial_hide)(fl_Dial o);+  FL_EXPORT_C(void, Fl_Dial_hide_super)(fl_Dial o); #ifdef __cplusplus } #endif

@@ -1,10 +1,82 @@ #include "Fl_File_BrowserC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_File_Browser_handle)(fl_File_Browser self, int event){-    return (static_cast<Fl_File_Browser*>(self))->handle(event);+  Fl_DerivedFile_Browser::Fl_DerivedFile_Browser(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_File_Browser(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedFile_Browser::Fl_DerivedFile_Browser(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_File_Browser(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedFile_Browser::~Fl_DerivedFile_Browser(){+    free(overriddenFuncs);+  }+  void Fl_DerivedFile_Browser::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_File_Browser) this);+    }+    else {+      Fl_File_Browser::draw();+    }+  }++  void Fl_DerivedFile_Browser::draw_super(){+    Fl_File_Browser::draw();+  }++  int Fl_DerivedFile_Browser::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_File_Browser) this,event);+    }+    else {+      i = Fl_File_Browser::handle(event);+    }+    return i;+  }+  int Fl_DerivedFile_Browser::handle_super(int event){+    return Fl_File_Browser::handle(event);+  }++  void Fl_DerivedFile_Browser::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_File_Browser) this,x,y,w,h);+    }+    else {+      Fl_File_Browser::resize(x,y,w,h);+    }+  }++  void Fl_DerivedFile_Browser::resize_super(int x, int y, int w, int h){+    Fl_File_Browser::resize(x,y,w,h);+  }+  void Fl_DerivedFile_Browser::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_File_Browser) this);+    }+    else {+      Fl_File_Browser::show();+    }+  }+  void Fl_DerivedFile_Browser::show_super(){+    Fl_File_Browser::show();+  }++  void Fl_DerivedFile_Browser::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_File_Browser) this);+    }+    else {+      Fl_File_Browser::hide();+    }+  }+  void Fl_DerivedFile_Browser::hide_super(){+    Fl_File_Browser::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_File_Browser_parent)(fl_File_Browser file_browser){     return (fl_Group) (static_cast<Fl_File_Browser*>(file_browser))->parent();   }@@ -153,12 +225,6 @@   FL_EXPORT_C(int,Fl_File_Browser_visible_r)(fl_File_Browser file_browser){     return (static_cast<Fl_File_Browser*>(file_browser))->visible_r();   }-  FL_EXPORT_C(void,Fl_File_Browser_show_super)(fl_File_Browser file_browser){-    return (static_cast<Fl_File_Browser*>(file_browser))->show();-  }-  FL_EXPORT_C(void,Fl_File_Browser_hide_super)(fl_File_Browser file_browser){-    return (static_cast<Fl_File_Browser*>(file_browser))->hide();-  }   FL_EXPORT_C(void,Fl_File_Browser_clear_visible)(fl_File_Browser file_browser){     (static_cast<Fl_File_Browser*>(file_browser))->clear_visible();   }@@ -285,18 +351,6 @@   FL_EXPORT_C(fl_Widget,Fl_File_Browser__ddfdesign_kludge)(fl_File_Browser file_browser){     return (static_cast<Fl_File_Browser*>(file_browser))->_ddfdesign_kludge();   }-  // FL_EXPORT_C(void,Fl_File_Browser_forms_end)(fl_File_Browser self){-  //   (static_cast<Fl_File_Browser*>(self))->forms_end();-  // }--  FL_EXPORT_C(fl_File_Browser, Fl_File_Browser_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_File_Browser* file_browser = new Fl_File_Browser(x,y,w,h,label);-    return (static_cast<fl_File_Browser>(file_browser));-  }-  FL_EXPORT_C(fl_File_Browser, Fl_File_Browser_New)(int x, int y, int w, int h) {-    Fl_File_Browser* file_browser = new Fl_File_Browser(x,y,w,h,0);-    return (fl_File_Browser)file_browser;-  }   FL_EXPORT_C(void,Fl_File_Browser_Destroy)(fl_File_Browser file_browser){     delete (static_cast<Fl_File_Browser*>(file_browser));   }@@ -361,15 +415,9 @@   FL_EXPORT_C(void,Fl_File_Browser_show_with_line)(fl_File_Browser file_browser,int line){     (static_cast<Fl_File_Browser*>(file_browser))->show(line);   }-  FL_EXPORT_C(void,Fl_File_Browser_show)(fl_File_Browser file_browser){-    (static_cast<Fl_File_Browser*>(file_browser))->show();-  }   FL_EXPORT_C(void,Fl_File_Browser_hide_with_line)(fl_File_Browser file_browser,int line){     (static_cast<Fl_File_Browser*>(file_browser))->hide(line);   }-  FL_EXPORT_C(void,Fl_File_Browser_hide)(fl_File_Browser file_browser){-    (static_cast<Fl_File_Browser*>(file_browser))->hide();-  }   FL_EXPORT_C(int,Fl_File_Browser_visible)(fl_File_Browser file_browser,int line){     return (static_cast<Fl_File_Browser*>(file_browser))->visible(line);   }@@ -516,6 +564,36 @@   }   FL_EXPORT_C(void,Fl_File_Browser_set_filetype)(fl_File_Browser file_browser,int t){     (static_cast<Fl_File_Browser*>(file_browser))->filetype(t);+  }+  FL_EXPORT_C(void, Fl_File_Browser_draw)(fl_File_Browser o){+    (static_cast<Fl_DerivedFile_Browser*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_File_Browser_draw_super)(fl_File_Browser o){+    (static_cast<Fl_DerivedFile_Browser*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_File_Browser_handle)(fl_File_Browser o, int event){+    return (static_cast<Fl_DerivedFile_Browser*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_File_Browser_handle_super)(fl_File_Browser o, int event){+    return (static_cast<Fl_DerivedFile_Browser*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_File_Browser_resize)(fl_File_Browser o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedFile_Browser*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_File_Browser_resize_super)(fl_File_Browser o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedFile_Browser*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_File_Browser_show)(fl_File_Browser o){+    (static_cast<Fl_DerivedFile_Browser*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_File_Browser_show_super)(fl_File_Browser o){+    (static_cast<Fl_DerivedFile_Browser*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_File_Browser_hide)(fl_File_Browser o){+    (static_cast<Fl_DerivedFile_Browser*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_File_Browser_hide_super)(fl_File_Browser o){+    (static_cast<Fl_DerivedFile_Browser*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -6,7 +6,26 @@ // the callback mechanism included below to work. #include "FL/Fl.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedFile_Browser : public Fl_File_Browser {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedFile_Browser(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedFile_Browser(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedFile_Browser();+  }; #endif #include "filenameC.h" @@ -18,14 +37,6 @@ #endif    /* Inherited from Fl_Widget */-  FL_EXPORT_C(int ,         Fl_File_Browser_handle_super)(fl_File_Browser file_browser,int event);-  FL_EXPORT_C(int ,         Fl_File_Browser_handle )(fl_File_Browser file_browser,int event);-  FL_EXPORT_C(void,         Fl_File_Browser_resize_super)(fl_File_Browser file_browser,int x, int y, int w, int h);-  FL_EXPORT_C(void,         Fl_File_Browser_resize )(fl_File_Browser file_browser,int x, int y, int w, int h);-  FL_EXPORT_C(void,         Fl_File_Browser_show_super)(fl_File_Browser file_browser);-  FL_EXPORT_C(void,         Fl_File_Browser_show )(fl_File_Browser file_browser);-  FL_EXPORT_C(void,         Fl_File_Browser_hide_super)(fl_File_Browser file_browser);-  FL_EXPORT_C(void,         Fl_File_Browser_hide )(fl_File_Browser file_browser);   FL_EXPORT_C(fl_Window,    Fl_File_Browser_as_window_super)(fl_File_Browser file_browser);   FL_EXPORT_C(fl_Window,    Fl_File_Browser_as_window )(fl_File_Browser file_browser);   FL_EXPORT_C(fl_Gl_Window, Fl_File_Browser_as_gl_window_super)(fl_File_Browser file_browser);@@ -208,6 +219,19 @@   FL_EXPORT_C(int, Fl_File_Browser_load)(fl_File_Browser file_browser,const char *directory, Fl_File_Sort_F* sort);   FL_EXPORT_C(int, Fl_File_Browser_filetype)(fl_File_Browser file_browser);   FL_EXPORT_C(void, Fl_File_Browser_set_filetype)(fl_File_Browser file_browser,int t);+  FL_EXPORT_C(fl_File_Browser,    Fl_OverriddenFile_Browser_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_File_Browser,    Fl_OverriddenFile_Browser_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_File_Browser_draw)(fl_File_Browser o);+  FL_EXPORT_C(void, Fl_File_Browser_draw_super)(fl_File_Browser o);+  FL_EXPORT_C(int, Fl_File_Browser_handle)(fl_File_Browser o, int event);+  FL_EXPORT_C(int, Fl_File_Browser_handle_super)(fl_File_Browser o, int event);+  FL_EXPORT_C(void, Fl_File_Browser_resize)(fl_File_Browser o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_File_Browser_resize_super)(fl_File_Browser o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_File_Browser_show)(fl_File_Browser o);+  FL_EXPORT_C(void, Fl_File_Browser_show_super)(fl_File_Browser o);+  FL_EXPORT_C(void, Fl_File_Browser_hide)(fl_File_Browser o);+  FL_EXPORT_C(void, Fl_File_Browser_hide_super)(fl_File_Browser o);+ #ifdef __cplusplus } #endif

@@ -2,11 +2,81 @@  #ifdef __cplusplus EXPORT {+  Fl_DerivedFile_Input::Fl_DerivedFile_Input(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_File_Input(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedFile_Input::Fl_DerivedFile_Input(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_File_Input(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedFile_Input::~Fl_DerivedFile_Input(){+    free(overriddenFuncs);+  }+  void Fl_DerivedFile_Input::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_File_Input) this);+    }+    else {+      Fl_File_Input::draw();+    }+  }++  void Fl_DerivedFile_Input::draw_super(){+    Fl_File_Input::draw();+  }++  int Fl_DerivedFile_Input::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_File_Input) this,event);+    }+    else {+      i = Fl_File_Input::handle(event);+    }+    return i;+  }+  int Fl_DerivedFile_Input::handle_super(int event){+    return Fl_File_Input::handle(event);+  }++  void Fl_DerivedFile_Input::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_File_Input) this,x,y,w,h);+    }+    else {+      Fl_File_Input::resize(x,y,w,h);+    }+  }++  void Fl_DerivedFile_Input::resize_super(int x, int y, int w, int h){+    Fl_File_Input::resize(x,y,w,h);+  }+  void Fl_DerivedFile_Input::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_File_Input) this);+    }+    else {+      Fl_File_Input::show();+    }+  }+  void Fl_DerivedFile_Input::show_super(){+    Fl_File_Input::show();+  }++  void Fl_DerivedFile_Input::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_File_Input) this);+    }+    else {+      Fl_File_Input::hide();+    }+  }+  void Fl_DerivedFile_Input::hide_super(){+    Fl_File_Input::hide();+  } #endif   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int,Fl_File_Input_handle)(fl_File_Input self, int event){-    return (static_cast<Fl_File_Input*>(self))->handle(event);-  }   FL_EXPORT_C(fl_Group,Fl_File_Input_parent)(fl_File_Input file_input){     return (fl_Group) (static_cast<Fl_File_Input*>(file_input))->parent();   }@@ -267,20 +337,9 @@     return (fl_Gl_Window) (static_cast<Fl_File_Input*>(file_input))->as_gl_window();   }   /* Fl_File_Input specific functions */-  FL_EXPORT_C(fl_File_Input, Fl_File_Input_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_File_Input* file_input = new Fl_File_Input(x,y,w,h,label);-    return (static_cast<fl_File_Input>(file_input));-  }-  FL_EXPORT_C(fl_File_Input, Fl_File_Input_New)(int x, int y, int w, int h) {-    Fl_File_Input* file_input = new Fl_File_Input(x,y,w,h,0);-    return (static_cast<fl_File_Input>(file_input));-  }   FL_EXPORT_C(void,Fl_File_Input_Destroy)(fl_File_Input file_input){     delete (static_cast<Fl_File_Input*>(file_input));   }-  FL_EXPORT_C(void,Fl_File_Input_resize)(fl_File_Input file_input,int X,int Y,int W,int H){-    (static_cast<Fl_File_Input*>(file_input))->resize(X,Y,W,H);-  }   FL_EXPORT_C(int,Fl_File_Input_static_value)(fl_File_Input file_input,const char* text){     return (static_cast<Fl_File_Input*>(file_input))->static_value(text);   }@@ -421,6 +480,54 @@   }   FL_EXPORT_C(void,Fl_File_Input_set_down_box)(fl_File_Input file_input,Fl_Boxtype color){     (static_cast<Fl_File_Input*>(file_input))->down_box(color);+  }+  FL_EXPORT_C(void, Fl_File_Input_draw)(fl_File_Input o){+    (static_cast<Fl_DerivedFile_Input*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_File_Input_draw_super)(fl_File_Input o){+    (static_cast<Fl_DerivedFile_Input*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_File_Input_handle)(fl_File_Input o, int event){+    return (static_cast<Fl_DerivedFile_Input*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_File_Input_handle_super)(fl_File_Input o, int event){+    return (static_cast<Fl_DerivedFile_Input*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_File_Input_resize)(fl_File_Input o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedFile_Input*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_File_Input_resize_super)(fl_File_Input o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedFile_Input*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_File_Input_show)(fl_File_Input o){+    (static_cast<Fl_DerivedFile_Input*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_File_Input_show_super)(fl_File_Input o){+    (static_cast<Fl_DerivedFile_Input*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_File_Input_hide)(fl_File_Input o){+    (static_cast<Fl_DerivedFile_Input*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_File_Input_hide_super)(fl_File_Input o){+    (static_cast<Fl_DerivedFile_Input*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_File_Input,    Fl_File_Input_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedFile_Input* w = new Fl_DerivedFile_Input(X,Y,W,H,fs);+    return (fl_File_Input)w;+  }+  FL_EXPORT_C(fl_File_Input,    Fl_File_Input_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedFile_Input* w = new Fl_DerivedFile_Input(X,Y,W,H,label,fs);+    return (fl_File_Input)w;+  }+  FL_EXPORT_C(fl_File_Input,    Fl_OverriddenFile_Input_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedFile_Input* w = new Fl_DerivedFile_Input(X,Y,W,H,fs);+    return (fl_File_Input)w;+  }+  FL_EXPORT_C(fl_File_Input,    Fl_OverriddenFile_Input_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedFile_Input* w = new Fl_DerivedFile_Input(X,Y,W,H,label,fs);+    return (fl_File_Input)w;   } #ifdef __cplusplus }

@@ -7,10 +7,28 @@ #include "FL/Fl.H" #include "FL/Fl_File_Input.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedFile_Input : public Fl_File_Input {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedFile_Input(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedFile_Input(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedFile_Input();+  }; #endif   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int,Fl_File_Input_handle)(fl_File_Input self, int event);   FL_EXPORT_C(fl_Group,     Fl_File_Input_parent)(fl_File_Input file_input);   FL_EXPORT_C(void,         Fl_File_Input_set_parent)(fl_File_Input file_input, fl_Group grp);   FL_EXPORT_C(uchar,        Fl_File_Input_type)(fl_File_Input file_input);@@ -95,7 +113,6 @@   FL_EXPORT_C(fl_Gl_Window, Fl_File_Input_as_gl_window)(fl_File_Input file_input);   /* Inherited from Fl_Input */   FL_EXPORT_C(int,           Fl_File_Input_handle)(fl_File_Input file_input, int event);-  FL_EXPORT_C(void,        Fl_File_Input_resize)(fl_File_Input file_input, int X, int Y, int W, int H);   FL_EXPORT_C(int,         Fl_File_Input_static_value)(fl_File_Input file_input, const char* text);   FL_EXPORT_C(int,         Fl_File_Input_static_value_with_length)(fl_File_Input file_input, const char* text, int length);   FL_EXPORT_C(Fl_Char,     Fl_File_Input_index)(fl_File_Input file_input, int i);@@ -148,6 +165,18 @@   FL_EXPORT_C(void,         Fl_File_Input_set_errorcolor)(fl_File_Input file_input, Fl_Color color);   FL_EXPORT_C(Fl_Boxtype,  Fl_File_Input_down_box)(fl_File_Input file_input);   FL_EXPORT_C(void,         Fl_File_Input_set_down_box)(fl_File_Input file_input, Fl_Boxtype color);+  FL_EXPORT_C(fl_File_Input,    Fl_OverriddenFile_Input_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_File_Input,    Fl_OverriddenFile_Input_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_File_Input_draw)(fl_File_Input o);+  FL_EXPORT_C(void, Fl_File_Input_draw_super)(fl_File_Input o);+  FL_EXPORT_C(int, Fl_File_Input_handle)(fl_File_Input o, int event);+  FL_EXPORT_C(int, Fl_File_Input_handle_super)(fl_File_Input o, int event);+  FL_EXPORT_C(void, Fl_File_Input_resize)(fl_File_Input o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_File_Input_resize_super)(fl_File_Input o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_File_Input_show)(fl_File_Input o);+  FL_EXPORT_C(void, Fl_File_Input_show_super)(fl_File_Input o);+  FL_EXPORT_C(void, Fl_File_Input_hide)(fl_File_Input o);+  FL_EXPORT_C(void, Fl_File_Input_hide_super)(fl_File_Input o); #ifdef __cplusplus } #endif

@@ -1,5 +1,79 @@ #include "Fl_GroupC.h" #ifdef __cplusplus+Fl_DerivedGroup::Fl_DerivedGroup(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Group(X,Y,W,H,l){+  overriddenFuncs = funcs;+  other_data = (void*)0;+}+Fl_DerivedGroup::Fl_DerivedGroup(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Group(X,Y,W,H){+  overriddenFuncs = funcs;+  other_data = (void*)0;+}+Fl_DerivedGroup::~Fl_DerivedGroup(){+  free(overriddenFuncs);+}+void Fl_DerivedGroup::draw(){+  if (this->overriddenFuncs->draw != NULL) {+    this->overriddenFuncs->draw((fl_Group) this);+  }+  else {+    Fl_Group::draw();+  }+}++void Fl_DerivedGroup::draw_super(){+  Fl_Group::draw();+}++int Fl_DerivedGroup::handle(int event){+  int i;+  if (this->overriddenFuncs->handle != NULL) {+    i = this->overriddenFuncs->handle((fl_Group) this,event);+  }+  else {+    i = Fl_Group::handle(event);+  }+  return i;+}+int Fl_DerivedGroup::handle_super(int event){+  return Fl_Group::handle(event);+}++void Fl_DerivedGroup::resize(int x, int y, int w, int h){+  if (this->overriddenFuncs->resize != NULL) {+    this->overriddenFuncs->resize((fl_Group) this,x,y,w,h);+  }+  else {+    Fl_Group::resize(x,y,w,h);+  }+}++void Fl_DerivedGroup::resize_super(int x, int y, int w, int h){+  Fl_Group::resize(x,y,w,h);+}+void Fl_DerivedGroup::show(){+  if (this->overriddenFuncs->show != NULL) {+    this->overriddenFuncs->show((fl_Group) this);+  }+  else {+    Fl_Group::show();+  }+}+void Fl_DerivedGroup::show_super(){+  Fl_Group::show();+}++void Fl_DerivedGroup::hide(){+  if (this->overriddenFuncs->hide != NULL) {+    this->overriddenFuncs->hide((fl_Group) this);+  }+  else {+    Fl_Group::hide();+  }+}+void Fl_DerivedGroup::hide_super(){+  Fl_Group::hide();+}+ void Fl_DerivedGroup::draw_child(Fl_Widget* widget){   Fl_Group::draw_child(*widget); }@@ -12,11 +86,39 @@ void Fl_DerivedGroup::update_child(Fl_Widget* widget){   Fl_Group::update_child(*widget); }+ EXPORT { #endif   FL_EXPORT_C(int,Fl_Group_handle)(fl_Group self, int event){     return (static_cast<Fl_DerivedGroup*>(self))->handle(event);   }+  FL_EXPORT_C(int,Fl_Group_handle_super)(fl_Group self, int event){+    return (static_cast<Fl_DerivedGroup*>(self))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Group_resize)(fl_Group self, int x, int y, int w, int h){+    (static_cast<Fl_DerivedGroup*>(self))->resize(x, y, w, h);+  }+  FL_EXPORT_C(void, Fl_Group_resize_super)(fl_Group self, int x, int y, int w, int h){+    (static_cast<Fl_DerivedGroup*>(self))->resize_super(x, y, w, h);+  }+  FL_EXPORT_C(void,Fl_Group_draw)(fl_Group self){+    (static_cast<Fl_DerivedGroup*>(self))->draw();+  }+  FL_EXPORT_C(void,Fl_Group_draw_super)(fl_Group self){+    (static_cast<Fl_DerivedGroup*>(self))->draw_super();+  }+  FL_EXPORT_C(void,Fl_Group_show)(fl_Group self){+    (static_cast<Fl_DerivedGroup*>(self))->show();+  }+  FL_EXPORT_C(void,Fl_Group_show_super)(fl_Group self){+    (static_cast<Fl_DerivedGroup*>(self))->show_super();+  }+  FL_EXPORT_C(void,Fl_Group_hide)(fl_Group self){+    (static_cast<Fl_DerivedGroup*>(self))->hide();+  }+  FL_EXPORT_C(void,Fl_Group_hide_super)(fl_Group self){+    (static_cast<Fl_DerivedGroup*>(self))->hide_super();+  }   FL_EXPORT_C(fl_Group,Fl_Group_parent)(fl_Group win){     return (fl_Group) (static_cast<Fl_DerivedGroup*>(win))->parent();   }@@ -357,13 +459,23 @@   FL_EXPORT_C(fl_Widget, Fl_Group_child)(fl_Group self, int n){     return (fl_Widget)(static_cast<Fl_DerivedGroup*>(self))->child(n);   }-  FL_EXPORT_C(fl_Group,     Fl_Group_New)(int x, int y, int w, int h){-    Fl_DerivedGroup* g = new Fl_DerivedGroup(x,y,w,h);-    return (fl_Group)g;+  FL_EXPORT_C(fl_Group,    Fl_Group_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedGroup* w = new Fl_DerivedGroup(X,Y,W,H,fs);+    return (fl_Group)w;   }-  FL_EXPORT_C(fl_Group,     Fl_Group_New_WithLabel)(int x, int y, int w, int h, const char* t){-    Fl_DerivedGroup* g = new Fl_DerivedGroup(x,y,w,h,t);-    return (fl_Group)g;+  FL_EXPORT_C(fl_Group,    Fl_Group_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedGroup* w = new Fl_DerivedGroup(X,Y,W,H,label,fs);+    return (fl_Group)w;+  }+  FL_EXPORT_C(fl_Group,    Fl_OverriddenGroup_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedGroup* w = new Fl_DerivedGroup(X,Y,W,H,fs);+    return (fl_Group)w;+  }+  FL_EXPORT_C(fl_Group,    Fl_OverriddenGroup_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedGroup* w = new Fl_DerivedGroup(X,Y,W,H,label,fs);+    return (fl_Group)w;   }   FL_EXPORT_C(void, Fl_Group_Destroy)(fl_Group group){     delete (static_cast<Fl_DerivedGroup*>(group));

@@ -7,19 +7,35 @@ #include "FL/Fl.H" #include "FL/Fl_Group.H" #include "Fl_CallbackC.h"-class Fl_DerivedGroup : public Fl_Group {-public:-  void draw_child(Fl_Widget* widget);-  void draw_children();-  void draw_outside_label(Fl_Widget* widget);-  void update_child(Fl_Widget* widget);-  Fl_DerivedGroup(int X, int Y, int W, int H, const char *l) : Fl_Group(X,Y,W,H,l){};-  Fl_DerivedGroup(int X, int Y, int W, int H):Fl_Group(X,Y,W,H,0){};-};+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedGroup : public Fl_Group {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    void draw_child(Fl_Widget* widget);+    void draw_children();+    void draw_outside_label(Fl_Widget* widget);+    void update_child(Fl_Widget* widget);+    Fl_DerivedGroup(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedGroup(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedGroup();+  };+ #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,          Fl_Group_handle)(fl_Group self, int event);+  FL_EXPORT_C(int,          Fl_Group_handle_super)(fl_Group self, int event);   FL_EXPORT_C(fl_Group,     Fl_Group_parent)(fl_Group group);   FL_EXPORT_C(void,         Fl_Group_set_parent)(fl_Group group, fl_Group grp);   FL_EXPORT_C(uchar,        Fl_Group_type)(fl_Group group);@@ -109,6 +125,7 @@   FL_EXPORT_C(fl_Gl_Window, Fl_Group_as_gl_window)(fl_Group group);   FL_EXPORT_C(void,         Fl_Group_resize_super)(fl_Group group,int X, int Y, int W, int H);   FL_EXPORT_C(void,         Fl_Group_resize)(fl_Group group,int X, int Y, int W, int H);+  FL_EXPORT_C(void ,Fl_Group_resize_super)(fl_Group self, int x, int y, int w, int h);    /* Fl_Group static members */   FL_EXPORT_C(fl_Group,Fl_Group_current)();@@ -120,6 +137,8 @@   FL_EXPORT_C(void,         Fl_Group_draw_outside_label)(fl_Group group, fl_Widget widget);   FL_EXPORT_C(void,         Fl_Group_update_child)(fl_Group group, fl_Widget widget);   FL_EXPORT_C(void,         Fl_Group_begin)(fl_Group group);+  FL_EXPORT_C(void,         Fl_Group_draw)(fl_Group group);+  FL_EXPORT_C(void,         Fl_Group_draw_super)(fl_Group group);   FL_EXPORT_C(void,         Fl_Group_end)(fl_Group group);   FL_EXPORT_C(int,          Fl_Group_find)(fl_Group group, fl_Widget w);   FL_EXPORT_C(void,         Fl_Group_add)(fl_Group group, fl_Widget w);@@ -142,6 +161,8 @@   FL_EXPORT_C(fl_Widget,    Fl_Group_child)(fl_Group self, int n);   FL_EXPORT_C(fl_Group,     Fl_Group_New)(int x, int y, int w, int h);   FL_EXPORT_C(fl_Group,     Fl_Group_New_WithLabel)(int x, int y, int w, int h, const char* t);+  FL_EXPORT_C(fl_Group,    Fl_OverriddenGroup_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Group,    Fl_OverriddenGroup_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);   FL_EXPORT_C(void,         Fl_Group_Destroy)(fl_Group group); #ifdef __cplusplus }

@@ -2,11 +2,81 @@  #ifdef __cplusplus EXPORT {+  Fl_DerivedInput::Fl_DerivedInput(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Input(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedInput::Fl_DerivedInput(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Input(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedInput::~Fl_DerivedInput(){+    free(overriddenFuncs);+  }+  void Fl_DerivedInput::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Input) this);+    }+    else {+      Fl_Input::draw();+    }+  }++  void Fl_DerivedInput::draw_super(){+    Fl_Input::draw();+  }++  int Fl_DerivedInput::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Input) this,event);+    }+    else {+      i = Fl_Input::handle(event);+    }+    return i;+  }+  int Fl_DerivedInput::handle_super(int event){+    return Fl_Input::handle(event);+  }++  void Fl_DerivedInput::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Input) this,x,y,w,h);+    }+    else {+      Fl_Input::resize(x,y,w,h);+    }+  }++  void Fl_DerivedInput::resize_super(int x, int y, int w, int h){+    Fl_Input::resize(x,y,w,h);+  }+  void Fl_DerivedInput::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Input) this);+    }+    else {+      Fl_Input::show();+    }+  }+  void Fl_DerivedInput::show_super(){+    Fl_Input::show();+  }++  void Fl_DerivedInput::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Input) this);+    }+    else {+      Fl_Input::hide();+    }+  }+  void Fl_DerivedInput::hide_super(){+    Fl_Input::hide();+  } #endif   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int,Fl_Input_handle)(fl_Input self, int event){-    return (static_cast<Fl_Input*>(self))->handle(event);-  }   FL_EXPORT_C(fl_Group,Fl_Input_parent)(fl_Input input){     return (fl_Group) (static_cast<Fl_Input*>(input))->parent();   }@@ -268,20 +338,9 @@     return (fl_Gl_Window) (static_cast<Fl_Input*>(input))->as_gl_window();   }   /* Fl_Input specific functions */-  FL_EXPORT_C(fl_Input, Fl_Input_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Input* input = new Fl_Input(x,y,w,h,label);-    return (static_cast<fl_Input>(input));-  }-  FL_EXPORT_C(fl_Input, Fl_Input_New)(int x, int y, int w, int h) {-    Fl_Input* input = new Fl_Input(x,y,w,h,0);-    return (fl_Input)input;-  }   FL_EXPORT_C(void,Fl_Input_Destroy)(fl_Input input){     delete (static_cast<Fl_Input*>(input));   }-  FL_EXPORT_C(void,Fl_Input_resize)(fl_Input input,int X,int Y,int W,int H){-    (static_cast<Fl_Input*>(input))->resize(X,Y,W,H);-  }   FL_EXPORT_C(int,Fl_Input_set_value)(fl_Input input,const char* text){     return (static_cast<Fl_Input*>(input))->value(text);   }@@ -411,6 +470,55 @@   FL_EXPORT_C(int,Fl_Input_set_tab_nav)(fl_Input input){     return (static_cast<Fl_Input*>(input))->tab_nav();   }+  FL_EXPORT_C(void, Fl_Input_draw)(fl_Input o){+    (static_cast<Fl_DerivedInput*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Input_draw_super)(fl_Input o){+    (static_cast<Fl_DerivedInput*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Input_handle)(fl_Input o, int event){+    return (static_cast<Fl_DerivedInput*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Input_handle_super)(fl_Input o, int event){+    return (static_cast<Fl_DerivedInput*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Input_resize)(fl_Input o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedInput*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Input_resize_super)(fl_Input o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedInput*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Input_show)(fl_Input o){+    (static_cast<Fl_DerivedInput*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Input_show_super)(fl_Input o){+    (static_cast<Fl_DerivedInput*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Input_hide)(fl_Input o){+    (static_cast<Fl_DerivedInput*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Input_hide_super)(fl_Input o){+    (static_cast<Fl_DerivedInput*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Input,    Fl_Input_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedInput* w = new Fl_DerivedInput(X,Y,W,H,fs);+    return (fl_Input)w;+  }+  FL_EXPORT_C(fl_Input,    Fl_Input_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedInput* w = new Fl_DerivedInput(X,Y,W,H,label,fs);+    return (fl_Input)w;+  }+  FL_EXPORT_C(fl_Input,    Fl_OverriddenInput_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedInput* w = new Fl_DerivedInput(X,Y,W,H,fs);+    return (fl_Input)w;+  }+  FL_EXPORT_C(fl_Input,    Fl_OverriddenInput_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedInput* w = new Fl_DerivedInput(X,Y,W,H,label,fs);+    return (fl_Input)w;+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Input.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedInput : public Fl_Input {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedInput(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedInput(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedInput();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Input_handle)(fl_Input self, int event);@@ -96,10 +115,10 @@   FL_EXPORT_C(fl_Gl_Window, Fl_Input_as_gl_window)(fl_Input input);   /* Fl_Input specific functions */   FL_EXPORT_C(int,      Fl_Input_handle)(fl_Input input, int event);-  FL_EXPORT_C(fl_Input, Fl_Input_New_WithLabel)(int x, int y, int w, int h, const char* label); -  FL_EXPORT_C(fl_Input, Fl_Input_New)(int x, int y, int w, int h); +  FL_EXPORT_C(fl_Input, Fl_Input_New_WithLabel)(int x, int y, int w, int h, const char* label);+  FL_EXPORT_C(fl_Input, Fl_Input_New)(int x, int y, int w, int h);   FL_EXPORT_C(void,     Fl_Input_Destroy)(fl_Input input);-  +   FL_EXPORT_C(void,         Fl_Input_resize)(fl_Input input, int X, int Y, int W, int H);   FL_EXPORT_C(int,          Fl_Input_set_value)(fl_Input input, const char* text);   FL_EXPORT_C(int,          Fl_Input_set_value_with_length)(fl_Input input, const char* text, int length);@@ -144,6 +163,18 @@   FL_EXPORT_C(void,         Fl_Input_set_wrap)(fl_Input input,int b);   FL_EXPORT_C(void,         Fl_Input_tab_nav)(fl_Input input,int val);   FL_EXPORT_C(int,          Fl_Input_set_tab_nav)(fl_Input input);+  FL_EXPORT_C(fl_Input,    Fl_OverriddenInput_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Input,    Fl_OverriddenInput_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Input_draw)(fl_Input o);+  FL_EXPORT_C(void, Fl_Input_draw_super)(fl_Input o);+  FL_EXPORT_C(int, Fl_Input_handle)(fl_Input o, int event);+  FL_EXPORT_C(int, Fl_Input_handle_super)(fl_Input o, int event);+  FL_EXPORT_C(void, Fl_Input_resize)(fl_Input o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Input_resize_super)(fl_Input o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Input_show)(fl_Input o);+  FL_EXPORT_C(void, Fl_Input_show_super)(fl_Input o);+  FL_EXPORT_C(void, Fl_Input_hide)(fl_Input o);+  FL_EXPORT_C(void, Fl_Input_hide_super)(fl_Input o); #ifdef __cplusplus } #endif

@@ -2,10 +2,82 @@  #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Light_Button_handle)(fl_Light_Button self, int event){-    return (static_cast<Fl_Light_Button*>(self))->handle(event);+  Fl_DerivedLight_Button::Fl_DerivedLight_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Light_Button(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedLight_Button::Fl_DerivedLight_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Light_Button(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedLight_Button::~Fl_DerivedLight_Button(){+    free(overriddenFuncs);+  }+  void Fl_DerivedLight_Button::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Light_Button) this);+    }+    else {+      Fl_Light_Button::draw();+    }+  }++  void Fl_DerivedLight_Button::draw_super(){+    Fl_Light_Button::draw();+  }++  int Fl_DerivedLight_Button::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Light_Button) this,event);+    }+    else {+      i = Fl_Light_Button::handle(event);+    }+    return i;+  }+  int Fl_DerivedLight_Button::handle_super(int event){+    return Fl_Light_Button::handle(event);+  }++  void Fl_DerivedLight_Button::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Light_Button) this,x,y,w,h);+    }+    else {+      Fl_Light_Button::resize(x,y,w,h);+    }+  }++  void Fl_DerivedLight_Button::resize_super(int x, int y, int w, int h){+    Fl_Light_Button::resize(x,y,w,h);+  }+  void Fl_DerivedLight_Button::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Light_Button) this);+    }+    else {+      Fl_Light_Button::show();+    }+  }+  void Fl_DerivedLight_Button::show_super(){+    Fl_Light_Button::show();+  }++  void Fl_DerivedLight_Button::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Light_Button) this);+    }+    else {+      Fl_Light_Button::hide();+    }+  }+  void Fl_DerivedLight_Button::hide_super(){+    Fl_Light_Button::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Light_Button_parent)(fl_Light_Button b){     return (fl_Group) (static_cast<Fl_Light_Button*>(b))->parent();   }@@ -266,14 +338,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Light_Button_as_gl_window)(fl_Light_Button light_button){     return (fl_Gl_Window) (static_cast<Fl_Light_Button*>(light_button))->as_gl_window();   }-  FL_EXPORT_C(fl_Light_Button, Fl_Light_Button_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Light_Button* button = new Fl_Light_Button(x,y,w,h,label);-    return (static_cast<fl_Light_Button>(button));-  }-  FL_EXPORT_C(fl_Light_Button, Fl_Light_Button_New)(int x, int y, int w, int h) {-    Fl_Light_Button* button = new Fl_Light_Button(x,y,w,h,0);-    return (fl_Light_Button)button;-  }   FL_EXPORT_C(void,Fl_Light_Button_Destroy)(fl_Light_Button button){     delete (static_cast<Fl_Light_Button*>(button));   }@@ -306,6 +370,54 @@   }   FL_EXPORT_C(void,Fl_Light_Button_set_down_color)(fl_Light_Button b,Fl_Color c){     (static_cast<Fl_Light_Button*>(b))->down_color(c);+  }+  FL_EXPORT_C(fl_Light_Button,    Fl_Light_Button_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedLight_Button* w = new Fl_DerivedLight_Button(X,Y,W,H,fs);+    return (fl_Light_Button)w;+  }+  FL_EXPORT_C(fl_Light_Button,    Fl_Light_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedLight_Button* w = new Fl_DerivedLight_Button(X,Y,W,H,label,fs);+    return (fl_Light_Button)w;+  }+  FL_EXPORT_C(fl_Light_Button,    Fl_OverriddenLight_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedLight_Button* w = new Fl_DerivedLight_Button(X,Y,W,H,fs);+    return (fl_Light_Button)w;+  }+  FL_EXPORT_C(fl_Light_Button,    Fl_OverriddenLight_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedLight_Button* w = new Fl_DerivedLight_Button(X,Y,W,H,label,fs);+    return (fl_Light_Button)w;+  }+  FL_EXPORT_C(void, Fl_Light_Button_draw)(fl_Light_Button o){+    (static_cast<Fl_DerivedLight_Button*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Light_Button_draw_super)(fl_Light_Button o){+    (static_cast<Fl_DerivedLight_Button*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Light_Button_handle)(fl_Light_Button o, int event){+    return (static_cast<Fl_DerivedLight_Button*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Light_Button_handle_super)(fl_Light_Button o, int event){+    return (static_cast<Fl_DerivedLight_Button*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Light_Button_resize)(fl_Light_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedLight_Button*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Light_Button_resize_super)(fl_Light_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedLight_Button*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Light_Button_show)(fl_Light_Button o){+    (static_cast<Fl_DerivedLight_Button*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Light_Button_show_super)(fl_Light_Button o){+    (static_cast<Fl_DerivedLight_Button*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Light_Button_hide)(fl_Light_Button o){+    (static_cast<Fl_DerivedLight_Button*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Light_Button_hide_super)(fl_Light_Button o){+    (static_cast<Fl_DerivedLight_Button*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Light_Button.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedLight_Button : public Fl_Light_Button {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedLight_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedLight_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedLight_Button();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Light_Button_handle)(fl_Light_Button self, int event);@@ -109,6 +128,19 @@   FL_EXPORT_C(void        , Fl_Light_Button_set_down_box)(fl_Light_Button b,Fl_Boxtype boxtype);   FL_EXPORT_C(Fl_Color    , Fl_Light_Button_down_color )(fl_Light_Button b);   FL_EXPORT_C(void        , Fl_Light_Button_set_down_color)(fl_Light_Button b, Fl_Color c);+  FL_EXPORT_C(fl_Light_Button,    Fl_OverriddenLight_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Light_Button,    Fl_OverriddenLight_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Light_Button_draw)(fl_Light_Button o);+  FL_EXPORT_C(void, Fl_Light_Button_draw_super)(fl_Light_Button o);+  FL_EXPORT_C(int, Fl_Light_Button_handle)(fl_Light_Button o, int event);+  FL_EXPORT_C(int, Fl_Light_Button_handle_super)(fl_Light_Button o, int event);+  FL_EXPORT_C(void, Fl_Light_Button_resize)(fl_Light_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Light_Button_resize_super)(fl_Light_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Light_Button_show)(fl_Light_Button o);+  FL_EXPORT_C(void, Fl_Light_Button_show_super)(fl_Light_Button o);+  FL_EXPORT_C(void, Fl_Light_Button_hide)(fl_Light_Button o);+  FL_EXPORT_C(void, Fl_Light_Button_hide_super)(fl_Light_Button o);+ #ifdef __cplusplus } #endif

@@ -2,20 +2,132 @@ #include "UtilsC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Menu_Bar_handle )(fl_Menu_Bar menu_bar, int event){-    return (static_cast<Fl_Menu_Bar*>(menu_bar))->handle(event);+  Fl_DerivedMenu_Bar::Fl_DerivedMenu_Bar(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Menu_Bar(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(fl_Menu_Bar, Fl_Menu_Bar_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Menu_Bar* menu_bar = new Fl_Menu_Bar(x,y,w,h,label);-    return (static_cast<fl_Menu_Bar>(menu_bar));+  Fl_DerivedMenu_Bar::Fl_DerivedMenu_Bar(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Menu_Bar(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(fl_Menu_Bar, Fl_Menu_Bar_New)(int x, int y, int w, int h) {-    Fl_Menu_Bar* menu_bar = new Fl_Menu_Bar(x,y,w,h,0);-    return (fl_Menu_Bar)menu_bar;+  Fl_DerivedMenu_Bar::~Fl_DerivedMenu_Bar(){+    free(overriddenFuncs);   }+  void Fl_DerivedMenu_Bar::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Menu_Bar) this);+    }+    else {+      Fl_Menu_Bar::draw();+    }+  }++  void Fl_DerivedMenu_Bar::draw_super(){+    Fl_Menu_Bar::draw();+  }++  int Fl_DerivedMenu_Bar::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Menu_Bar) this,event);+    }+    else {+      i = Fl_Menu_Bar::handle(event);+    }+    return i;+  }+  int Fl_DerivedMenu_Bar::handle_super(int event){+    return Fl_Menu_Bar::handle(event);+  }++  void Fl_DerivedMenu_Bar::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Menu_Bar) this,x,y,w,h);+    }+    else {+      Fl_Menu_Bar::resize(x,y,w,h);+    }+  }++  void Fl_DerivedMenu_Bar::resize_super(int x, int y, int w, int h){+    Fl_Menu_Bar::resize(x,y,w,h);+  }+  void Fl_DerivedMenu_Bar::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Menu_Bar) this);+    }+    else {+      Fl_Menu_Bar::show();+    }+  }+  void Fl_DerivedMenu_Bar::show_super(){+    Fl_Menu_Bar::show();+  }++  void Fl_DerivedMenu_Bar::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Menu_Bar) this);+    }+    else {+      Fl_Menu_Bar::hide();+    }+  }+  void Fl_DerivedMenu_Bar::hide_super(){+    Fl_Menu_Bar::hide();+  }+++#endif   FL_EXPORT_C(void   , Fl_Menu_Bar_Destroy)(fl_Menu_Bar menu_bar){     delete (static_cast<Fl_Menu_Bar*>(menu_bar));+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_draw)(fl_Menu_Bar o){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_draw_super)(fl_Menu_Bar o){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Menu_Bar_handle)(fl_Menu_Bar o, int event){+    return (static_cast<Fl_DerivedMenu_Bar*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Menu_Bar_handle_super)(fl_Menu_Bar o, int event){+    return (static_cast<Fl_DerivedMenu_Bar*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_resize)(fl_Menu_Bar o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_resize_super)(fl_Menu_Bar o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_show)(fl_Menu_Bar o){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_show_super)(fl_Menu_Bar o){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_hide)(fl_Menu_Bar o){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Menu_Bar_hide_super)(fl_Menu_Bar o){+    (static_cast<Fl_DerivedMenu_Bar*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Menu_Bar,    Fl_Menu_Bar_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedMenu_Bar* w = new Fl_DerivedMenu_Bar(X,Y,W,H,fs);+    return (fl_Menu_Bar)w;+  }+  FL_EXPORT_C(fl_Menu_Bar,    Fl_Menu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedMenu_Bar* w = new Fl_DerivedMenu_Bar(X,Y,W,H,label,fs);+    return (fl_Menu_Bar)w;+  }+  FL_EXPORT_C(fl_Menu_Bar,    Fl_OverriddenMenu_Bar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedMenu_Bar* w = new Fl_DerivedMenu_Bar(X,Y,W,H,fs);+    return (fl_Menu_Bar)w;+  }+  FL_EXPORT_C(fl_Menu_Bar,    Fl_OverriddenMenu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedMenu_Bar* w = new Fl_DerivedMenu_Bar(X,Y,W,H,label,fs);+    return (fl_Menu_Bar)w;   } #ifdef __cplusplus }

@@ -7,12 +7,43 @@ #include "FL/Fl.H" #include "FL/Fl_Menu_Bar.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedMenu_Bar : public Fl_Menu_Bar {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedMenu_Bar(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedMenu_Bar(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedMenu_Bar();+  }; #endif   FL_EXPORT_C(int,          Fl_Menu_Bar_handle)(fl_Group self, int event);   FL_EXPORT_C(fl_Menu_Bar,   Fl_Menu_Bar_New_WithLabel)(int x, int y, int w, int h, const char* label);   FL_EXPORT_C(fl_Menu_Bar   , Fl_Menu_Bar_New)(int x, int y, int w, int h);   FL_EXPORT_C(void   , Fl_Menu_Bar_Destroy)(fl_Menu_Bar menu_bar);+  FL_EXPORT_C(fl_Menu_Bar,    Fl_OverriddenMenu_Bar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Menu_Bar,    Fl_OverriddenMenu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Menu_Bar_draw)(fl_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Menu_Bar_draw_super)(fl_Menu_Bar o);+  FL_EXPORT_C(int, Fl_Menu_Bar_handle)(fl_Menu_Bar o, int event);+  FL_EXPORT_C(int, Fl_Menu_Bar_handle_super)(fl_Menu_Bar o, int event);+  FL_EXPORT_C(void, Fl_Menu_Bar_resize)(fl_Menu_Bar o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Menu_Bar_resize_super)(fl_Menu_Bar o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Menu_Bar_show)(fl_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Menu_Bar_show_super)(fl_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Menu_Bar_hide)(fl_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Menu_Bar_hide_super)(fl_Menu_Bar o); #ifdef __cplusplus } #endif

@@ -2,19 +2,82 @@ #include "UtilsC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Menu_Button_handle )(fl_Menu_Button menu_button, int event){-    return (static_cast<Fl_Menu_Button*>(menu_button))->handle(event);+  Fl_DerivedMenu_Button::Fl_DerivedMenu_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Menu_Button(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Menu_Button_resize )(fl_Menu_Button menu_button,int x, int y, int w, int h){-    (static_cast<Fl_Menu_Button*>(menu_button))->resize(x,y,w,h);+  Fl_DerivedMenu_Button::Fl_DerivedMenu_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Menu_Button(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Menu_Button_show )(fl_Menu_Button menu_button){-    (static_cast<Fl_Menu_Button*>(menu_button))->show();+  Fl_DerivedMenu_Button::~Fl_DerivedMenu_Button(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Menu_Button_hide )(fl_Menu_Button menu_button){-    (static_cast<Fl_Menu_Button*>(menu_button))->hide();+  void Fl_DerivedMenu_Button::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Menu_Button) this);+    }+    else {+      Fl_Menu_Button::draw();+    }   }++  void Fl_DerivedMenu_Button::draw_super(){+    Fl_Menu_Button::draw();+  }++  int Fl_DerivedMenu_Button::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Menu_Button) this,event);+    }+    else {+      i = Fl_Menu_Button::handle(event);+    }+    return i;+  }+  int Fl_DerivedMenu_Button::handle_super(int event){+    return Fl_Menu_Button::handle(event);+  }++  void Fl_DerivedMenu_Button::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Menu_Button) this,x,y,w,h);+    }+    else {+      Fl_Menu_Button::resize(x,y,w,h);+    }+  }++  void Fl_DerivedMenu_Button::resize_super(int x, int y, int w, int h){+    Fl_Menu_Button::resize(x,y,w,h);+  }+  void Fl_DerivedMenu_Button::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Menu_Button) this);+    }+    else {+      Fl_Menu_Button::show();+    }+  }+  void Fl_DerivedMenu_Button::show_super(){+    Fl_Menu_Button::show();+  }++  void Fl_DerivedMenu_Button::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Menu_Button) this);+    }+    else {+      Fl_Menu_Button::hide();+    }+  }+  void Fl_DerivedMenu_Button::hide_super(){+    Fl_Menu_Button::hide();+  }+++#endif   FL_EXPORT_C(fl_Window,Fl_Menu_Button_as_window )(fl_Menu_Button menu_button){     return (static_cast<Fl_Menu_Button*>(menu_button))->as_window();   }@@ -265,14 +328,6 @@   FL_EXPORT_C(void,Fl_Menu_Button_measure_label)(fl_Menu_Button menu_button,int* ww,int* hh){     (static_cast<Fl_Menu_Button*>(menu_button))->measure_label(*ww,*hh);   }-  FL_EXPORT_C(fl_Menu_Button, Fl_Menu_Button_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Menu_Button* menu_button = new Fl_Menu_Button(x,y,w,h,label);-    return (static_cast<fl_Menu_Button>(menu_button));-  }-  FL_EXPORT_C(fl_Menu_Button, Fl_Menu_Button_New)(int x, int y, int w, int h) {-    Fl_Menu_Button* menu_button = new Fl_Menu_Button(x,y,w,h,0);-    return (fl_Menu_Button)menu_button;-  }   FL_EXPORT_C(void   , Fl_Menu_Button_Destroy)(fl_Menu_Button menu_button){     delete (static_cast<Fl_Menu_Button*>(menu_button));   }@@ -434,6 +489,54 @@   }   FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Button_popup)(fl_Menu_Button menu_button) {     return (fl_Menu_Item)(static_cast<Fl_Menu_Button*>(menu_button))->popup();+  }+  FL_EXPORT_C(fl_Menu_Button,    Fl_Menu_Button_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedMenu_Button* w = new Fl_DerivedMenu_Button(X,Y,W,H,fs);+    return (fl_Menu_Button)w;+  }+  FL_EXPORT_C(fl_Menu_Button,    Fl_Menu_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedMenu_Button* w = new Fl_DerivedMenu_Button(X,Y,W,H,label,fs);+    return (fl_Menu_Button)w;+  }+  FL_EXPORT_C(fl_Menu_Button,    Fl_OverriddenMenu_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedMenu_Button* w = new Fl_DerivedMenu_Button(X,Y,W,H,fs);+    return (fl_Menu_Button)w;+  }+  FL_EXPORT_C(fl_Menu_Button,    Fl_OverriddenMenu_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedMenu_Button* w = new Fl_DerivedMenu_Button(X,Y,W,H,label,fs);+    return (fl_Menu_Button)w;+  }+  FL_EXPORT_C(void, Fl_Menu_Button_draw)(fl_Menu_Button o){+    (static_cast<Fl_DerivedMenu_Button*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Menu_Button_draw_super)(fl_Menu_Button o){+    (static_cast<Fl_DerivedMenu_Button*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Menu_Button_handle)(fl_Menu_Button o, int event){+    return (static_cast<Fl_DerivedMenu_Button*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Menu_Button_handle_super)(fl_Menu_Button o, int event){+    return (static_cast<Fl_DerivedMenu_Button*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Menu_Button_resize)(fl_Menu_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedMenu_Button*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Menu_Button_resize_super)(fl_Menu_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedMenu_Button*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Menu_Button_show)(fl_Menu_Button o){+    (static_cast<Fl_DerivedMenu_Button*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Menu_Button_show_super)(fl_Menu_Button o){+    (static_cast<Fl_DerivedMenu_Button*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Menu_Button_hide)(fl_Menu_Button o){+    (static_cast<Fl_DerivedMenu_Button*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Menu_Button_hide_super)(fl_Menu_Button o){+    (static_cast<Fl_DerivedMenu_Button*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -8,7 +8,26 @@ #include "FL/Fl_Menu_Button.H" #include "Fl_CallbackC.h" #include "Fl_Menu_C.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedMenu_Button : public Fl_Menu_Button {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedMenu_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedMenu_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedMenu_Button();+  }; #endif #ifndef INTERNAL_LINKAGE   typedef enum Menu_Button_Type {@@ -171,6 +190,18 @@   FL_EXPORT_C(Fl_Color, Fl_Menu_Button_down_color)(fl_Menu_Button menu_button);   FL_EXPORT_C(void, Fl_Menu_Button_set_down_color)(fl_Menu_Button menu_button, unsigned c);   FL_EXPORT_C(fl_Menu_Item, Fl_Menu_Button_popup)(fl_Menu_Button menu_button);+  FL_EXPORT_C(fl_Menu_Button,    Fl_OverriddenMenu_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Menu_Button,    Fl_OverriddenMenu_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Menu_Button_draw)(fl_Menu_Button o);+  FL_EXPORT_C(void, Fl_Menu_Button_draw_super)(fl_Menu_Button o);+  FL_EXPORT_C(int, Fl_Menu_Button_handle)(fl_Menu_Button o, int event);+  FL_EXPORT_C(int, Fl_Menu_Button_handle_super)(fl_Menu_Button o, int event);+  FL_EXPORT_C(void, Fl_Menu_Button_resize)(fl_Menu_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Menu_Button_resize_super)(fl_Menu_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Menu_Button_show)(fl_Menu_Button o);+  FL_EXPORT_C(void, Fl_Menu_Button_show_super)(fl_Menu_Button o);+  FL_EXPORT_C(void, Fl_Menu_Button_hide)(fl_Menu_Button o);+  FL_EXPORT_C(void, Fl_Menu_Button_hide_super)(fl_Menu_Button o); #ifdef __cplusplus } #endif

@@ -2,11 +2,83 @@  #ifdef __cplusplus EXPORT {+  Fl_DerivedOutput::Fl_DerivedOutput(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Output(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedOutput::Fl_DerivedOutput(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Output(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedOutput::~Fl_DerivedOutput(){+    free(overriddenFuncs);+  }+  void Fl_DerivedOutput::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Output) this);+    }+    else {+      Fl_Output::draw();+    }+  }++  void Fl_DerivedOutput::draw_super(){+    Fl_Output::draw();+  }++  int Fl_DerivedOutput::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Output) this,event);+    }+    else {+      i = Fl_Output::handle(event);+    }+    return i;+  }+  int Fl_DerivedOutput::handle_super(int event){+    return Fl_Output::handle(event);+  }++  void Fl_DerivedOutput::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Output) this,x,y,w,h);+    }+    else {+      Fl_Output::resize(x,y,w,h);+    }+  }++  void Fl_DerivedOutput::resize_super(int x, int y, int w, int h){+    Fl_Output::resize(x,y,w,h);+  }+  void Fl_DerivedOutput::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Output) this);+    }+    else {+      Fl_Output::show();+    }+  }+  void Fl_DerivedOutput::show_super(){+    Fl_Output::show();+  }++  void Fl_DerivedOutput::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Output) this);+    }+    else {+      Fl_Output::hide();+    }+  }+  void Fl_DerivedOutput::hide_super(){+    Fl_Output::hide();+  }++ #endif   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int,Fl_Output_handle)(fl_Output self, int event){-    return (static_cast<Fl_Output*>(self))->handle(event);-  }   FL_EXPORT_C(fl_Group,Fl_Output_parent)(fl_Output output){     return (fl_Group) (static_cast<Fl_Output*>(output))->parent();   }@@ -267,21 +339,9 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Output_as_gl_window)(fl_Output output){     return (fl_Gl_Window) (static_cast<Fl_Output*>(output))->as_gl_window();   }-  /* Fl_Output specific functions */-  FL_EXPORT_C(fl_Output, Fl_Output_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Output* output = new Fl_Output(x,y,w,h,label);-    return (static_cast<fl_Output>(output));-  }-  FL_EXPORT_C(fl_Output, Fl_Output_New)(int x, int y, int w, int h) {-    Fl_Output* output = new Fl_Output(x,y,w,h,0);-    return (fl_Output)output;-  }   FL_EXPORT_C(void,Fl_Output_Destroy)(fl_Output output){     delete (static_cast<Fl_Output*>(output));   }-  FL_EXPORT_C(void,Fl_Output_resize)(fl_Output output,int X,int Y,int W,int H){-    (static_cast<Fl_Output*>(output))->resize(X,Y,W,H);-  }   FL_EXPORT_C(int,Fl_Output_set_value)(fl_Output output,const char* text){     return (static_cast<Fl_Output*>(output))->value(text);   }@@ -411,6 +471,55 @@   FL_EXPORT_C(int,Fl_Output_set_tab_nav)(fl_Output output){     return (static_cast<Fl_Output*>(output))->tab_nav();   }+  FL_EXPORT_C(fl_Output,    Fl_Output_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedOutput* w = new Fl_DerivedOutput(X,Y,W,H,fs);+    return (fl_Output)w;+  }+  FL_EXPORT_C(fl_Output,    Fl_Output_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedOutput* w = new Fl_DerivedOutput(X,Y,W,H,label,fs);+    return (fl_Output)w;+  }+  FL_EXPORT_C(fl_Output,    Fl_OverriddenOutput_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedOutput* w = new Fl_DerivedOutput(X,Y,W,H,fs);+    return (fl_Output)w;+  }+  FL_EXPORT_C(fl_Output,    Fl_OverriddenOutput_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedOutput* w = new Fl_DerivedOutput(X,Y,W,H,label,fs);+    return (fl_Output)w;+  }+  FL_EXPORT_C(void, Fl_Output_draw)(fl_Output o){+    (static_cast<Fl_DerivedOutput*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Output_draw_super)(fl_Output o){+    (static_cast<Fl_DerivedOutput*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Output_handle)(fl_Output o, int event){+    return (static_cast<Fl_DerivedOutput*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Output_handle_super)(fl_Output o, int event){+    return (static_cast<Fl_DerivedOutput*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Output_resize)(fl_Output o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedOutput*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Output_resize_super)(fl_Output o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedOutput*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Output_show)(fl_Output o){+    (static_cast<Fl_DerivedOutput*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Output_show_super)(fl_Output o){+    (static_cast<Fl_DerivedOutput*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Output_hide)(fl_Output o){+    (static_cast<Fl_DerivedOutput*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Output_hide_super)(fl_Output o){+    (static_cast<Fl_DerivedOutput*>(o))->hide_super();+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,27 @@ #include "FL/Fl.H" #include "FL/Fl_Output.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedOutput : public Fl_Output {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedOutput(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedOutput(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedOutput();+  };+ #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Output_handle)(fl_Output self, int event);@@ -96,10 +116,10 @@   FL_EXPORT_C(fl_Gl_Window, Fl_Output_as_gl_window)(fl_Output output);   /* Fl_Output specific functions */   FL_EXPORT_C(int,      Fl_Output_handle)(fl_Output output, int event);-  FL_EXPORT_C(fl_Output, Fl_Output_New_WithLabel)(int x, int y, int w, int h, const char* label); -  FL_EXPORT_C(fl_Output, Fl_Output_New)(int x, int y, int w, int h); +  FL_EXPORT_C(fl_Output, Fl_Output_New_WithLabel)(int x, int y, int w, int h, const char* label);+  FL_EXPORT_C(fl_Output, Fl_Output_New)(int x, int y, int w, int h);   FL_EXPORT_C(void,     Fl_Output_Destroy)(fl_Output output);-  +   FL_EXPORT_C(void,         Fl_Output_resize)(fl_Output output, int X, int Y, int W, int H);   FL_EXPORT_C(int,          Fl_Output_set_value)(fl_Output output, const char*);   FL_EXPORT_C(int,          Fl_Output_set_value_with_length)(fl_Output output, const char* text, int length);@@ -144,6 +164,18 @@   FL_EXPORT_C(void,         Fl_Output_set_wrap)(fl_Output output,int b);   FL_EXPORT_C(void,         Fl_Output_tab_nav)(fl_Output output,int val);   FL_EXPORT_C(int,          Fl_Output_set_tab_nav)(fl_Output output);+  FL_EXPORT_C(fl_Output,    Fl_OverriddenOutput_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Output,    Fl_OverriddenOutput_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Output_draw)(fl_Output o);+  FL_EXPORT_C(void, Fl_Output_draw_super)(fl_Output o);+  FL_EXPORT_C(int, Fl_Output_handle)(fl_Output o, int event);+  FL_EXPORT_C(int, Fl_Output_handle_super)(fl_Output o, int event);+  FL_EXPORT_C(void, Fl_Output_resize)(fl_Output o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Output_resize_super)(fl_Output o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Output_show)(fl_Output o);+  FL_EXPORT_C(void, Fl_Output_show_super)(fl_Output o);+  FL_EXPORT_C(void, Fl_Output_hide)(fl_Output o);+  FL_EXPORT_C(void, Fl_Output_hide_super)(fl_Output o); #ifdef __cplusplus } #endif

@@ -1,6 +1,81 @@ #include "Fl_PackC.h" #ifdef __cplusplus EXPORT {+  Fl_DerivedPack::Fl_DerivedPack(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Pack(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedPack::Fl_DerivedPack(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Pack(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedPack::~Fl_DerivedPack(){+    free(overriddenFuncs);+  }+  void Fl_DerivedPack::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Pack) this);+    }+    else {+      Fl_Pack::draw();+    }+  }++  void Fl_DerivedPack::draw_super(){+    Fl_Pack::draw();+  }++  int Fl_DerivedPack::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Pack) this,event);+    }+    else {+      i = Fl_Pack::handle(event);+    }+    return i;+  }+  int Fl_DerivedPack::handle_super(int event){+    return Fl_Pack::handle(event);+  }++  void Fl_DerivedPack::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Pack) this,x,y,w,h);+    }+    else {+      Fl_Pack::resize(x,y,w,h);+    }+  }++  void Fl_DerivedPack::resize_super(int x, int y, int w, int h){+    Fl_Pack::resize(x,y,w,h);+  }+  void Fl_DerivedPack::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Pack) this);+    }+    else {+      Fl_Pack::show();+    }+  }+  void Fl_DerivedPack::show_super(){+    Fl_Pack::show();+  }++  void Fl_DerivedPack::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Pack) this);+    }+    else {+      Fl_Pack::hide();+    }+  }+  void Fl_DerivedPack::hide_super(){+    Fl_Pack::hide();+  }++ #endif   FL_EXPORT_C(void ,Fl_Pack_set_spacing)(fl_Pack self, int pixels){     (static_cast<Fl_Pack*>(self))->spacing(pixels);@@ -11,21 +86,60 @@   FL_EXPORT_C(uchar, Fl_Pack_horizontal)(fl_Pack self){     return (static_cast<Fl_Pack*>(self))->horizontal();   }-  FL_EXPORT_C(fl_Pack, Fl_Pack_New)(int x, int y, int w, int h){-    Fl_Pack* g = new Fl_Pack(x,y,w,h);-    return (fl_Pack)g;-  }-  FL_EXPORT_C(fl_Pack, Fl_Pack_New_WithLabel)(int x, int y, int w, int h, const char* t){-    Fl_Pack* g = new Fl_Pack(x,y,w,h,t);-    return (fl_Pack)g;-  }   FL_EXPORT_C(uchar,Fl_Pack_type)(fl_Pack win){     return (static_cast<Fl_Pack*>(win))->type();   }   FL_EXPORT_C(void,Fl_Pack_set_type)(fl_Pack win,uchar t){     (static_cast<Fl_Pack*>(win))->type(t);   }-+  FL_EXPORT_C(fl_Pack,    Fl_Pack_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedPack* w = new Fl_DerivedPack(X,Y,W,H,fs);+    return (fl_Pack)w;+  }+  FL_EXPORT_C(fl_Pack,    Fl_Pack_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedPack* w = new Fl_DerivedPack(X,Y,W,H,label,fs);+    return (fl_Pack)w;+  }+  FL_EXPORT_C(fl_Pack,    Fl_OverriddenPack_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedPack* w = new Fl_DerivedPack(X,Y,W,H,fs);+    return (fl_Pack)w;+  }+  FL_EXPORT_C(fl_Pack,    Fl_OverriddenPack_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedPack* w = new Fl_DerivedPack(X,Y,W,H,label,fs);+    return (fl_Pack)w;+  }+  FL_EXPORT_C(void, Fl_Pack_draw)(fl_Pack o){+    (static_cast<Fl_DerivedPack*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Pack_draw_super)(fl_Pack o){+    (static_cast<Fl_DerivedPack*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Pack_handle)(fl_Pack o, int event){+    return (static_cast<Fl_DerivedPack*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Pack_handle_super)(fl_Pack o, int event){+    return (static_cast<Fl_DerivedPack*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Pack_resize)(fl_Pack o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedPack*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Pack_resize_super)(fl_Pack o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedPack*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Pack_show)(fl_Pack o){+    (static_cast<Fl_DerivedPack*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Pack_show_super)(fl_Pack o){+    (static_cast<Fl_DerivedPack*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Pack_hide)(fl_Pack o){+    (static_cast<Fl_DerivedPack*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Pack_hide_super)(fl_Pack o){+    (static_cast<Fl_DerivedPack*>(o))->hide_super();+  } #ifdef __cplusplus } #endif

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Pack.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedPack : public Fl_Pack {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedPack(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedPack(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedPack();+  }; #endif   FL_EXPORT_C(uchar,   Fl_Pack_type)(fl_Pack pack);   FL_EXPORT_C(void,    Fl_Pack_set_type)(fl_Pack pack, uchar);@@ -16,6 +35,18 @@   FL_EXPORT_C(uchar,   Fl_Pack_horizontal)(fl_Pack p);   FL_EXPORT_C(fl_Pack, Fl_Pack_New)(int x, int y, int w, int h);   FL_EXPORT_C(fl_Pack, Fl_Pack_New_WithLabel)(int x, int y, int w, int h, const char* t);+  FL_EXPORT_C(fl_Pack,    Fl_OverriddenPack_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Pack,    Fl_OverriddenPack_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Pack_draw)(fl_Pack o);+  FL_EXPORT_C(void, Fl_Pack_draw_super)(fl_Pack o);+  FL_EXPORT_C(int, Fl_Pack_handle)(fl_Pack o, int event);+  FL_EXPORT_C(int, Fl_Pack_handle_super)(fl_Pack o, int event);+  FL_EXPORT_C(void, Fl_Pack_resize)(fl_Pack o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Pack_resize_super)(fl_Pack o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Pack_show)(fl_Pack o);+  FL_EXPORT_C(void, Fl_Pack_show_super)(fl_Pack o);+  FL_EXPORT_C(void, Fl_Pack_hide)(fl_Pack o);+  FL_EXPORT_C(void, Fl_Pack_hide_super)(fl_Pack o); #ifdef __cplusplus } #endif

@@ -1,19 +1,80 @@ #include "Fl_PositionerC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Positioner_handle )(fl_Positioner positioner, int event){-    return (static_cast<Fl_Positioner*>(positioner))->handle(event);+  Fl_DerivedPositioner::Fl_DerivedPositioner(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Positioner(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Positioner_resize )(fl_Positioner positioner,int x, int y, int w, int h){-    (static_cast<Fl_Positioner*>(positioner))->resize(x,y,w,h);+  Fl_DerivedPositioner::Fl_DerivedPositioner(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Positioner(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Positioner_show )(fl_Positioner positioner){-    (static_cast<Fl_Positioner*>(positioner))->show();+  Fl_DerivedPositioner::~Fl_DerivedPositioner(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Positioner_hide )(fl_Positioner positioner){-    (static_cast<Fl_Positioner*>(positioner))->hide();+  void Fl_DerivedPositioner::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Positioner) this);+    }+    else {+      Fl_Positioner::draw();+    }   }++  void Fl_DerivedPositioner::draw_super(){+    Fl_Positioner::draw();+  }++  int Fl_DerivedPositioner::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Positioner) this,event);+    }+    else {+      i = Fl_Positioner::handle(event);+    }+    return i;+  }+  int Fl_DerivedPositioner::handle_super(int event){+    return Fl_Positioner::handle(event);+  }++  void Fl_DerivedPositioner::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Positioner) this,x,y,w,h);+    }+    else {+      Fl_Positioner::resize(x,y,w,h);+    }+  }++  void Fl_DerivedPositioner::resize_super(int x, int y, int w, int h){+    Fl_Positioner::resize(x,y,w,h);+  }+  void Fl_DerivedPositioner::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Positioner) this);+    }+    else {+      Fl_Positioner::show();+    }+  }+  void Fl_DerivedPositioner::show_super(){+    Fl_Positioner::show();+  }++  void Fl_DerivedPositioner::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Positioner) this);+    }+    else {+      Fl_Positioner::hide();+    }+  }+  void Fl_DerivedPositioner::hide_super(){+    Fl_Positioner::hide();+  }+#endif   FL_EXPORT_C(fl_Window,Fl_Positioner_as_window )(fl_Positioner positioner){     return (static_cast<Fl_Positioner*>(positioner))->as_window();   }@@ -276,14 +337,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Positioner_as_gl_window)(fl_Positioner positioner){     return (fl_Gl_Window) (static_cast<Fl_Positioner*>(positioner))->as_gl_window();   }-  FL_EXPORT_C(fl_Positioner, Fl_Positioner_New)(int x, int y, int w, int h){-    Fl_Positioner* p = new Fl_Positioner(x,y,w,h);-    return (fl_Positioner)p;-  }-  FL_EXPORT_C(fl_Positioner, Fl_Positioner_New_WithLabel)(int x, int y, int w, int h,const char *l){-    Fl_Positioner* p = new Fl_Positioner(x,y,w,h,l);-    return (fl_Positioner)p;-  }   FL_EXPORT_C(void , Fl_Positioner_Destroy)(fl_Positioner positioner){     delete (static_cast<Fl_Positioner*>(positioner));   }@@ -334,6 +387,54 @@   }   FL_EXPORT_C(void,Fl_Positioner_ystep)(fl_Positioner positioner,double x){     (static_cast<Fl_Positioner*>(positioner))->ystep(x);+  }+  FL_EXPORT_C(fl_Positioner,    Fl_Positioner_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedPositioner* w = new Fl_DerivedPositioner(X,Y,W,H,fs);+    return (fl_Positioner)w;+  }+  FL_EXPORT_C(fl_Positioner,    Fl_Positioner_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedPositioner* w = new Fl_DerivedPositioner(X,Y,W,H,label,fs);+    return (fl_Positioner)w;+  }+  FL_EXPORT_C(fl_Positioner,    Fl_OverriddenPositioner_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedPositioner* w = new Fl_DerivedPositioner(X,Y,W,H,fs);+    return (fl_Positioner)w;+  }+  FL_EXPORT_C(fl_Positioner,    Fl_OverriddenPositioner_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedPositioner* w = new Fl_DerivedPositioner(X,Y,W,H,label,fs);+    return (fl_Positioner)w;+  }+  FL_EXPORT_C(void, Fl_Positioner_draw)(fl_Positioner o){+    (static_cast<Fl_DerivedPositioner*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Positioner_draw_super)(fl_Positioner o){+    (static_cast<Fl_DerivedPositioner*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Positioner_handle)(fl_Positioner o, int event){+    return (static_cast<Fl_DerivedPositioner*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Positioner_handle_super)(fl_Positioner o, int event){+    return (static_cast<Fl_DerivedPositioner*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Positioner_resize)(fl_Positioner o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedPositioner*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Positioner_resize_super)(fl_Positioner o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedPositioner*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Positioner_show)(fl_Positioner o){+    (static_cast<Fl_DerivedPositioner*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Positioner_show_super)(fl_Positioner o){+    (static_cast<Fl_DerivedPositioner*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Positioner_hide)(fl_Positioner o){+    (static_cast<Fl_DerivedPositioner*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Positioner_hide_super)(fl_Positioner o){+    (static_cast<Fl_DerivedPositioner*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,13 +7,28 @@ #include "FL/Fl.H" #include "FL/Fl_Positioner.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedPositioner : public Fl_Positioner {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedPositioner(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedPositioner(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedPositioner();+  }; #endif   /* Inherited from Fl_Widget */-  FL_EXPORT_C(int ,         Fl_Positioner_handle )(fl_Positioner positioner,int event);-  FL_EXPORT_C(void,         Fl_Positioner_resize )(fl_Positioner positioner,int x, int y, int w, int h);-  FL_EXPORT_C(void,         Fl_Positioner_show )(fl_Positioner positioner);-  FL_EXPORT_C(void,         Fl_Positioner_hide )(fl_Positioner positioner);   FL_EXPORT_C(fl_Window,    Fl_Positioner_as_window )(fl_Positioner positioner);   FL_EXPORT_C(fl_Gl_Window, Fl_Positioner_as_gl_window)(fl_Positioner positioner);   FL_EXPORT_C(fl_Group,     Fl_Positioner_parent)(fl_Positioner positioner);@@ -119,6 +134,18 @@   FL_EXPORT_C(void, Fl_Positioner_ybounds)(fl_Positioner positioner, double ystart, double yend);   FL_EXPORT_C(void, Fl_Positioner_xstep)(fl_Positioner positioner, double xstep);   FL_EXPORT_C(void, Fl_Positioner_ystep)(fl_Positioner positioner, double ystep);+  FL_EXPORT_C(fl_Positioner,    Fl_OverriddenPositioner_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Positioner,    Fl_OverriddenPositioner_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Positioner_draw)(fl_Positioner o);+  FL_EXPORT_C(void, Fl_Positioner_draw_super)(fl_Positioner o);+  FL_EXPORT_C(int, Fl_Positioner_handle)(fl_Positioner o, int event);+  FL_EXPORT_C(int, Fl_Positioner_handle_super)(fl_Positioner o, int event);+  FL_EXPORT_C(void, Fl_Positioner_resize)(fl_Positioner o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Positioner_resize_super)(fl_Positioner o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Positioner_show)(fl_Positioner o);+  FL_EXPORT_C(void, Fl_Positioner_show_super)(fl_Positioner o);+  FL_EXPORT_C(void, Fl_Positioner_hide)(fl_Positioner o);+  FL_EXPORT_C(void, Fl_Positioner_hide_super)(fl_Positioner o); #ifdef __cplusplus } #endif

@@ -1,19 +1,82 @@ #include "Fl_ProgressC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Progress_handle )(fl_Progress progress, int event){-    return (static_cast<Fl_Progress*>(progress))->handle(event);+  Fl_DerivedProgress::Fl_DerivedProgress(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Progress(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Progress_resize )(fl_Progress progress,int x, int y, int w, int h){-    (static_cast<Fl_Progress*>(progress))->resize(x,y,w,h);+  Fl_DerivedProgress::Fl_DerivedProgress(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Progress(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Progress_show )(fl_Progress progress){-    (static_cast<Fl_Progress*>(progress))->show();+  Fl_DerivedProgress::~Fl_DerivedProgress(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Progress_hide )(fl_Progress progress){-    (static_cast<Fl_Progress*>(progress))->hide();+  void Fl_DerivedProgress::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Progress) this);+    }+    else {+      Fl_Progress::draw();+    }   }++  void Fl_DerivedProgress::draw_super(){+    Fl_Progress::draw();+  }++  int Fl_DerivedProgress::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Progress) this,event);+    }+    else {+      i = Fl_Progress::handle(event);+    }+    return i;+  }+  int Fl_DerivedProgress::handle_super(int event){+    return Fl_Progress::handle(event);+  }++  void Fl_DerivedProgress::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Progress) this,x,y,w,h);+    }+    else {+      Fl_Progress::resize(x,y,w,h);+    }+  }++  void Fl_DerivedProgress::resize_super(int x, int y, int w, int h){+    Fl_Progress::resize(x,y,w,h);+  }+  void Fl_DerivedProgress::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Progress) this);+    }+    else {+      Fl_Progress::show();+    }+  }+  void Fl_DerivedProgress::show_super(){+    Fl_Progress::show();+  }++  void Fl_DerivedProgress::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Progress) this);+    }+    else {+      Fl_Progress::hide();+    }+  }+  void Fl_DerivedProgress::hide_super(){+    Fl_Progress::hide();+  }+++#endif   FL_EXPORT_C(fl_Window,Fl_Progress_as_window )(fl_Progress progress){     return (static_cast<Fl_Progress*>(progress))->as_window();   }@@ -276,14 +339,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Progress_as_gl_window)(fl_Progress progress){     return (fl_Gl_Window) (static_cast<Fl_Progress*>(progress))->as_gl_window();   }-  FL_EXPORT_C(fl_Progress, Fl_Progress_New)(int x, int y, int w, int h){-    Fl_Progress* p = new Fl_Progress(x,y,w,h);-    return (fl_Progress)p;-  }-  FL_EXPORT_C(fl_Progress, Fl_Progress_New_WithLabel)(int x, int y, int w, int h,const char *l){-    Fl_Progress* p = new Fl_Progress(x,y,w,h,l);-    return (fl_Progress)p;-  }   FL_EXPORT_C(void , Fl_Progress_Destroy)(fl_Progress progress){     delete (static_cast<Fl_Progress*>(progress));   }@@ -305,6 +360,55 @@   FL_EXPORT_C(float,Fl_Progress_value)(fl_Progress progress){     return (static_cast<Fl_Progress*>(progress))->value();   }+  FL_EXPORT_C(fl_Progress,    Fl_Progress_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedProgress* w = new Fl_DerivedProgress(X,Y,W,H,fs);+    return (fl_Progress)w;+  }+  FL_EXPORT_C(fl_Progress,    Fl_Progress_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedProgress* w = new Fl_DerivedProgress(X,Y,W,H,label,fs);+    return (fl_Progress)w;+  }+  FL_EXPORT_C(fl_Progress,    Fl_OverriddenProgress_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedProgress* w = new Fl_DerivedProgress(X,Y,W,H,fs);+    return (fl_Progress)w;+  }+  FL_EXPORT_C(fl_Progress,    Fl_OverriddenProgress_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedProgress* w = new Fl_DerivedProgress(X,Y,W,H,label,fs);+    return (fl_Progress)w;+  }+  FL_EXPORT_C(void, Fl_Progress_draw)(fl_Progress o){+    (static_cast<Fl_DerivedProgress*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Progress_draw_super)(fl_Progress o){+    (static_cast<Fl_DerivedProgress*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Progress_handle)(fl_Progress o, int event){+    return (static_cast<Fl_DerivedProgress*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Progress_handle_super)(fl_Progress o, int event){+    return (static_cast<Fl_DerivedProgress*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Progress_resize)(fl_Progress o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedProgress*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Progress_resize_super)(fl_Progress o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedProgress*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Progress_show)(fl_Progress o){+    (static_cast<Fl_DerivedProgress*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Progress_show_super)(fl_Progress o){+    (static_cast<Fl_DerivedProgress*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Progress_hide)(fl_Progress o){+    (static_cast<Fl_DerivedProgress*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Progress_hide_super)(fl_Progress o){+    (static_cast<Fl_DerivedProgress*>(o))->hide_super();+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,27 @@ #include "FL/Fl.H" #include "FL/Fl_Progress.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedProgress : public Fl_Progress {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedProgress(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedProgress(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedProgress();+  };+ #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int ,         Fl_Progress_handle )(fl_Progress progress,int event);@@ -109,6 +129,18 @@   FL_EXPORT_C(float,     Fl_Progress_minimum)(fl_Progress progress);   FL_EXPORT_C(void ,     Fl_Progress_set_value  )(fl_Progress progress,float v);   FL_EXPORT_C(float,     Fl_Progress_value  )(fl_Progress progress);+  FL_EXPORT_C(fl_Progress,    Fl_OverriddenProgress_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Progress,    Fl_OverriddenProgress_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Progress_draw)(fl_Progress o);+  FL_EXPORT_C(void, Fl_Progress_draw_super)(fl_Progress o);+  FL_EXPORT_C(int, Fl_Progress_handle)(fl_Progress o, int event);+  FL_EXPORT_C(int, Fl_Progress_handle_super)(fl_Progress o, int event);+  FL_EXPORT_C(void, Fl_Progress_resize)(fl_Progress o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Progress_resize_super)(fl_Progress o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Progress_show)(fl_Progress o);+  FL_EXPORT_C(void, Fl_Progress_show_super)(fl_Progress o);+  FL_EXPORT_C(void, Fl_Progress_hide)(fl_Progress o);+  FL_EXPORT_C(void, Fl_Progress_hide_super)(fl_Progress o); #ifdef __cplusplus } #endif

@@ -2,10 +2,82 @@  #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Repeat_Button_handle)(fl_Repeat_Button self, int event){-    return (static_cast<Fl_Repeat_Button*>(self))->handle(event);+  Fl_DerivedRepeat_Button::Fl_DerivedRepeat_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Repeat_Button(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedRepeat_Button::Fl_DerivedRepeat_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Repeat_Button(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedRepeat_Button::~Fl_DerivedRepeat_Button(){+    free(overriddenFuncs);+  }+  void Fl_DerivedRepeat_Button::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Repeat_Button) this);+    }+    else {+      Fl_Repeat_Button::draw();+    }+  }++  void Fl_DerivedRepeat_Button::draw_super(){+    Fl_Repeat_Button::draw();+  }++  int Fl_DerivedRepeat_Button::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Repeat_Button) this,event);+    }+    else {+      i = Fl_Repeat_Button::handle(event);+    }+    return i;+  }+  int Fl_DerivedRepeat_Button::handle_super(int event){+    return Fl_Repeat_Button::handle(event);+  }++  void Fl_DerivedRepeat_Button::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Repeat_Button) this,x,y,w,h);+    }+    else {+      Fl_Repeat_Button::resize(x,y,w,h);+    }+  }++  void Fl_DerivedRepeat_Button::resize_super(int x, int y, int w, int h){+    Fl_Repeat_Button::resize(x,y,w,h);+  }+  void Fl_DerivedRepeat_Button::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Repeat_Button) this);+    }+    else {+      Fl_Repeat_Button::show();+    }+  }+  void Fl_DerivedRepeat_Button::show_super(){+    Fl_Repeat_Button::show();+  }++  void Fl_DerivedRepeat_Button::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Repeat_Button) this);+    }+    else {+      Fl_Repeat_Button::hide();+    }+  }+  void Fl_DerivedRepeat_Button::hide_super(){+    Fl_Repeat_Button::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Repeat_Button_parent)(fl_Repeat_Button b){     return (fl_Group) (static_cast<Fl_Repeat_Button*>(b))->parent();   }@@ -266,14 +338,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Repeat_Button_as_gl_window)(fl_Repeat_Button repeat_button){     return (fl_Gl_Window) (static_cast<Fl_Repeat_Button*>(repeat_button))->as_gl_window();   }-  FL_EXPORT_C(fl_Repeat_Button, Fl_Repeat_Button_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Repeat_Button* button = new Fl_Repeat_Button(x,y,w,h,label);-    return (static_cast<fl_Repeat_Button>(button));-  }-  FL_EXPORT_C(fl_Repeat_Button, Fl_Repeat_Button_New)(int x, int y, int w, int h) {-    Fl_Repeat_Button* button = new Fl_Repeat_Button(x,y,w,h,0);-    return (fl_Repeat_Button)button;-  }   FL_EXPORT_C(void,Fl_Repeat_Button_Destroy)(fl_Repeat_Button button){     delete (static_cast<Fl_Repeat_Button*>(button));   }@@ -306,6 +370,54 @@   }   FL_EXPORT_C(void,Fl_Repeat_Button_set_down_color)(fl_Repeat_Button b,Fl_Color c){     (static_cast<Fl_Repeat_Button*>(b))->down_color(c);+  }+  FL_EXPORT_C(fl_Repeat_Button,    Fl_Repeat_Button_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedRepeat_Button* w = new Fl_DerivedRepeat_Button(X,Y,W,H,fs);+    return (fl_Repeat_Button)w;+  }+  FL_EXPORT_C(fl_Repeat_Button,    Fl_Repeat_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedRepeat_Button* w = new Fl_DerivedRepeat_Button(X,Y,W,H,label,fs);+    return (fl_Repeat_Button)w;+  }+  FL_EXPORT_C(fl_Repeat_Button,    Fl_OverriddenRepeat_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedRepeat_Button* w = new Fl_DerivedRepeat_Button(X,Y,W,H,fs);+    return (fl_Repeat_Button)w;+  }+  FL_EXPORT_C(fl_Repeat_Button,    Fl_OverriddenRepeat_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedRepeat_Button* w = new Fl_DerivedRepeat_Button(X,Y,W,H,label,fs);+    return (fl_Repeat_Button)w;+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_draw)(fl_Repeat_Button o){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_draw_super)(fl_Repeat_Button o){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Repeat_Button_handle)(fl_Repeat_Button o, int event){+    return (static_cast<Fl_DerivedRepeat_Button*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Repeat_Button_handle_super)(fl_Repeat_Button o, int event){+    return (static_cast<Fl_DerivedRepeat_Button*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_resize)(fl_Repeat_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_resize_super)(fl_Repeat_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_show)(fl_Repeat_Button o){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_show_super)(fl_Repeat_Button o){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_hide)(fl_Repeat_Button o){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Repeat_Button_hide_super)(fl_Repeat_Button o){+    (static_cast<Fl_DerivedRepeat_Button*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Repeat_Button.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedRepeat_Button : public Fl_Repeat_Button {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedRepeat_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedRepeat_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedRepeat_Button();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Repeat_Button_handle)(fl_Repeat_Button self, int event);@@ -109,6 +128,18 @@   FL_EXPORT_C(void        , Fl_Repeat_Button_set_down_box)(fl_Repeat_Button b,Fl_Boxtype boxtype);   FL_EXPORT_C(Fl_Color    , Fl_Repeat_Button_down_color )(fl_Repeat_Button b);   FL_EXPORT_C(void        , Fl_Repeat_Button_set_down_color)(fl_Repeat_Button b, Fl_Color c);+  FL_EXPORT_C(fl_Repeat_Button,    Fl_OverriddenRepeat_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Repeat_Button,    Fl_OverriddenRepeat_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Repeat_Button_draw)(fl_Repeat_Button o);+  FL_EXPORT_C(void, Fl_Repeat_Button_draw_super)(fl_Repeat_Button o);+  FL_EXPORT_C(int, Fl_Repeat_Button_handle)(fl_Repeat_Button o, int event);+  FL_EXPORT_C(int, Fl_Repeat_Button_handle_super)(fl_Repeat_Button o, int event);+  FL_EXPORT_C(void, Fl_Repeat_Button_resize)(fl_Repeat_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Repeat_Button_resize_super)(fl_Repeat_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Repeat_Button_show)(fl_Repeat_Button o);+  FL_EXPORT_C(void, Fl_Repeat_Button_show_super)(fl_Repeat_Button o);+  FL_EXPORT_C(void, Fl_Repeat_Button_hide)(fl_Repeat_Button o);+  FL_EXPORT_C(void, Fl_Repeat_Button_hide_super)(fl_Repeat_Button o); #ifdef __cplusplus } #endif

@@ -2,10 +2,82 @@  #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Return_Button_handle)(fl_Return_Button self, int event){-    return (static_cast<Fl_Return_Button*>(self))->handle(event);+  Fl_DerivedReturn_Button::Fl_DerivedReturn_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Return_Button(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedReturn_Button::Fl_DerivedReturn_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Return_Button(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedReturn_Button::~Fl_DerivedReturn_Button(){+    free(overriddenFuncs);+  }+  void Fl_DerivedReturn_Button::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Return_Button) this);+    }+    else {+      Fl_Return_Button::draw();+    }+  }++  void Fl_DerivedReturn_Button::draw_super(){+    Fl_Return_Button::draw();+  }++  int Fl_DerivedReturn_Button::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Return_Button) this,event);+    }+    else {+      i = Fl_Return_Button::handle(event);+    }+    return i;+  }+  int Fl_DerivedReturn_Button::handle_super(int event){+    return Fl_Return_Button::handle(event);+  }++  void Fl_DerivedReturn_Button::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Return_Button) this,x,y,w,h);+    }+    else {+      Fl_Return_Button::resize(x,y,w,h);+    }+  }++  void Fl_DerivedReturn_Button::resize_super(int x, int y, int w, int h){+    Fl_Return_Button::resize(x,y,w,h);+  }+  void Fl_DerivedReturn_Button::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Return_Button) this);+    }+    else {+      Fl_Return_Button::show();+    }+  }+  void Fl_DerivedReturn_Button::show_super(){+    Fl_Return_Button::show();+  }++  void Fl_DerivedReturn_Button::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Return_Button) this);+    }+    else {+      Fl_Return_Button::hide();+    }+  }+  void Fl_DerivedReturn_Button::hide_super(){+    Fl_Return_Button::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Return_Button_parent)(fl_Return_Button b){     return (fl_Group) (static_cast<Fl_Return_Button*>(b))->parent();   }@@ -266,14 +338,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Return_Button_as_gl_window)(fl_Return_Button return_button){     return (fl_Gl_Window) (static_cast<Fl_Return_Button*>(return_button))->as_gl_window();   }-  FL_EXPORT_C(fl_Return_Button, Fl_Return_Button_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Return_Button* button = new Fl_Return_Button(x,y,w,h,label);-    return (static_cast<fl_Return_Button>(button));-  }-  FL_EXPORT_C(fl_Return_Button, Fl_Return_Button_New)(int x, int y, int w, int h) {-    Fl_Return_Button* button = new Fl_Return_Button(x,y,w,h,0);-    return (fl_Return_Button)button;-  }   FL_EXPORT_C(void,Fl_Return_Button_Destroy)(fl_Return_Button button){     delete (static_cast<Fl_Return_Button*>(button));   }@@ -307,6 +371,55 @@   FL_EXPORT_C(void,Fl_Return_Button_set_down_color)(fl_Return_Button b,Fl_Color c){     (static_cast<Fl_Return_Button*>(b))->down_color(c);   }+  FL_EXPORT_C(void, Fl_Return_Button_draw)(fl_Return_Button o){+    (static_cast<Fl_DerivedReturn_Button*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Return_Button_draw_super)(fl_Return_Button o){+    (static_cast<Fl_DerivedReturn_Button*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Return_Button_handle)(fl_Return_Button o, int event){+    return (static_cast<Fl_DerivedReturn_Button*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Return_Button_handle_super)(fl_Return_Button o, int event){+    return (static_cast<Fl_DerivedReturn_Button*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Return_Button_resize)(fl_Return_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedReturn_Button*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Return_Button_resize_super)(fl_Return_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedReturn_Button*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Return_Button_show)(fl_Return_Button o){+    (static_cast<Fl_DerivedReturn_Button*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Return_Button_show_super)(fl_Return_Button o){+    (static_cast<Fl_DerivedReturn_Button*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Return_Button_hide)(fl_Return_Button o){+    (static_cast<Fl_DerivedReturn_Button*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Return_Button_hide_super)(fl_Return_Button o){+    (static_cast<Fl_DerivedReturn_Button*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Return_Button,    Fl_Return_Button_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedReturn_Button* w = new Fl_DerivedReturn_Button(X,Y,W,H,fs);+    return (fl_Return_Button)w;+  }+  FL_EXPORT_C(fl_Return_Button,    Fl_Return_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedReturn_Button* w = new Fl_DerivedReturn_Button(X,Y,W,H,label,fs);+    return (fl_Return_Button)w;+  }+  FL_EXPORT_C(fl_Return_Button,    Fl_OverriddenReturn_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedReturn_Button* w = new Fl_DerivedReturn_Button(X,Y,W,H,fs);+    return (fl_Return_Button)w;+  }+  FL_EXPORT_C(fl_Return_Button,    Fl_OverriddenReturn_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedReturn_Button* w = new Fl_DerivedReturn_Button(X,Y,W,H,label,fs);+    return (fl_Return_Button)w;+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Return_Button.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedReturn_Button : public Fl_Return_Button {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedReturn_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedReturn_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedReturn_Button();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Return_Button_handle)(fl_Return_Button self, int event);@@ -109,6 +128,18 @@   FL_EXPORT_C(void        , Fl_Return_Button_set_down_box)(fl_Return_Button b,Fl_Boxtype boxtype);   FL_EXPORT_C(Fl_Color    , Fl_Return_Button_down_color )(fl_Return_Button b);   FL_EXPORT_C(void        , Fl_Return_Button_set_down_color)(fl_Return_Button b, Fl_Color c);+  FL_EXPORT_C(fl_Return_Button,    Fl_OverriddenReturn_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Return_Button,    Fl_OverriddenReturn_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Return_Button_draw)(fl_Return_Button o);+  FL_EXPORT_C(void, Fl_Return_Button_draw_super)(fl_Return_Button o);+  FL_EXPORT_C(int, Fl_Return_Button_handle)(fl_Return_Button o, int event);+  FL_EXPORT_C(int, Fl_Return_Button_handle_super)(fl_Return_Button o, int event);+  FL_EXPORT_C(void, Fl_Return_Button_resize)(fl_Return_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Return_Button_resize_super)(fl_Return_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Return_Button_show)(fl_Return_Button o);+  FL_EXPORT_C(void, Fl_Return_Button_show_super)(fl_Return_Button o);+  FL_EXPORT_C(void, Fl_Return_Button_hide)(fl_Return_Button o);+  FL_EXPORT_C(void, Fl_Return_Button_hide_super)(fl_Return_Button o); #ifdef __cplusplus } #endif

@@ -1,7 +1,82 @@ #include "Fl_RollerC.h" #ifdef __cplusplus EXPORT {-#endif  +  Fl_DerivedRoller::Fl_DerivedRoller(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Roller(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedRoller::Fl_DerivedRoller(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Roller(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedRoller::~Fl_DerivedRoller(){+    free(overriddenFuncs);+  }+  void Fl_DerivedRoller::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Roller) this);+    }+    else {+      Fl_Roller::draw();+    }+  }++  void Fl_DerivedRoller::draw_super(){+    Fl_Roller::draw();+  }++  int Fl_DerivedRoller::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Roller) this,event);+    }+    else {+      i = Fl_Roller::handle(event);+    }+    return i;+  }+  int Fl_DerivedRoller::handle_super(int event){+    return Fl_Roller::handle(event);+  }++  void Fl_DerivedRoller::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Roller) this,x,y,w,h);+    }+    else {+      Fl_Roller::resize(x,y,w,h);+    }+  }++  void Fl_DerivedRoller::resize_super(int x, int y, int w, int h){+    Fl_Roller::resize(x,y,w,h);+  }+  void Fl_DerivedRoller::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Roller) this);+    }+    else {+      Fl_Roller::show();+    }+  }+  void Fl_DerivedRoller::show_super(){+    Fl_Roller::show();+  }++  void Fl_DerivedRoller::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Roller) this);+    }+    else {+      Fl_Roller::hide();+    }+  }+  void Fl_DerivedRoller::hide_super(){+    Fl_Roller::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Roller_parent)(fl_Roller roller){     return (static_cast<Fl_Roller*>(roller))->parent();   }@@ -152,12 +227,6 @@   FL_EXPORT_C(int,Fl_Roller_visible_r)(fl_Roller roller){     return (static_cast<Fl_Roller*>(roller))->visible_r();   }-  FL_EXPORT_C(void,Fl_Roller_show)(fl_Roller roller){-    (static_cast<Fl_Roller*>(roller))->show();-  }-  FL_EXPORT_C(void,Fl_Roller_hide)(fl_Roller roller){-    (static_cast<Fl_Roller*>(roller))->hide();-  }   FL_EXPORT_C(void,Fl_Roller_set_visible)(fl_Roller roller){     (static_cast<Fl_Roller*>(roller))->visible();   }@@ -254,9 +323,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Roller_as_gl_window)(fl_Roller roller){     return (static_cast<Fl_Roller*>(roller))->as_gl_window();   }-  FL_EXPORT_C(void,Fl_Roller_resize)(fl_Roller roller,int X,int Y,int W,int H){-    (static_cast<Fl_Roller*>(roller))->resize(X,Y,W,H);-  }   FL_EXPORT_C(void,Fl_Roller_bounds)(fl_Roller roller,double a,double b){     (static_cast<Fl_Roller*>(roller))->bounds(a,b);   }@@ -308,20 +374,58 @@   FL_EXPORT_C(double,Fl_Roller_increment)(fl_Roller roller,double v,int n){     return (static_cast<Fl_Roller*>(roller))->increment(v,n);   }-  FL_EXPORT_C(fl_Roller,Fl_Roller_New_WithLabel)(int x,int y,int w,int h,const char* label){-    Fl_Roller* roller = new Fl_Roller(x,y,w,h,label);-    return (fl_Roller) roller;-  }-  FL_EXPORT_C(fl_Roller,Fl_Roller_New)(int x,int y,int w,int h){-    Fl_Roller* roller = new Fl_Roller(x,y,w,h);-    return (fl_Roller) roller;-  }   FL_EXPORT_C(void,Fl_Roller_Destroy)(fl_Roller roller){     delete (static_cast<Fl_Roller*>(roller));   }-  FL_EXPORT_C(int,Fl_Roller_handle)(fl_Roller roller,int event){-    return (static_cast<Fl_Roller*>(roller))->handle(event);+  FL_EXPORT_C(fl_Roller,    Fl_Roller_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedRoller* w = new Fl_DerivedRoller(X,Y,W,H,fs);+    return (fl_Roller)w;   }+  FL_EXPORT_C(fl_Roller,    Fl_Roller_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedRoller* w = new Fl_DerivedRoller(X,Y,W,H,label,fs);+    return (fl_Roller)w;+  }+  FL_EXPORT_C(fl_Roller,    Fl_OverriddenRoller_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedRoller* w = new Fl_DerivedRoller(X,Y,W,H,fs);+    return (fl_Roller)w;+  }+  FL_EXPORT_C(fl_Roller,    Fl_OverriddenRoller_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedRoller* w = new Fl_DerivedRoller(X,Y,W,H,label,fs);+    return (fl_Roller)w;+  }+  FL_EXPORT_C(void, Fl_Roller_draw)(fl_Roller o){+    (static_cast<Fl_DerivedRoller*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Roller_draw_super)(fl_Roller o){+    (static_cast<Fl_DerivedRoller*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Roller_handle)(fl_Roller o, int event){+    return (static_cast<Fl_DerivedRoller*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Roller_handle_super)(fl_Roller o, int event){+    return (static_cast<Fl_DerivedRoller*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Roller_resize)(fl_Roller o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedRoller*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Roller_resize_super)(fl_Roller o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedRoller*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Roller_show)(fl_Roller o){+    (static_cast<Fl_DerivedRoller*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Roller_show_super)(fl_Roller o){+    (static_cast<Fl_DerivedRoller*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Roller_hide)(fl_Roller o){+    (static_cast<Fl_DerivedRoller*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Roller_hide_super)(fl_Roller o){+    (static_cast<Fl_DerivedRoller*>(o))->hide_super();+  }+ #ifdef __cplusplus }-#endif +#endif

@@ -7,7 +7,27 @@ #include "FL/Fl.H" #include "FL/Fl_Roller.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedRoller : public Fl_Roller {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedRoller(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedRoller(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedRoller();+  };+ #endif   FL_EXPORT_C(fl_Group,     Fl_Roller_parent)(fl_Roller roller);   FL_EXPORT_C(void,         Fl_Roller_set_parent)(fl_Roller roller, fl_Group grp);@@ -117,6 +137,18 @@   FL_EXPORT_C(fl_Roller   , Fl_Roller_New)(int x, int y, int w, int h);   FL_EXPORT_C(void,      Fl_Roller_Destroy)(fl_Roller roller);   FL_EXPORT_C(int,       Fl_Roller_handle)(fl_Roller roller, int event);+  FL_EXPORT_C(fl_Roller,    Fl_OverriddenRoller_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Roller,    Fl_OverriddenRoller_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Roller_draw)(fl_Roller o);+  FL_EXPORT_C(void, Fl_Roller_draw_super)(fl_Roller o);+  FL_EXPORT_C(int, Fl_Roller_handle)(fl_Roller o, int event);+  FL_EXPORT_C(int, Fl_Roller_handle_super)(fl_Roller o, int event);+  FL_EXPORT_C(void, Fl_Roller_resize)(fl_Roller o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Roller_resize_super)(fl_Roller o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Roller_show)(fl_Roller o);+  FL_EXPORT_C(void, Fl_Roller_show_super)(fl_Roller o);+  FL_EXPORT_C(void, Fl_Roller_hide)(fl_Roller o);+  FL_EXPORT_C(void, Fl_Roller_hide_super)(fl_Roller o); #ifdef __cplusplus } #endif

@@ -2,10 +2,82 @@  #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Round_Button_handle)(fl_Round_Button self, int event){-    return (static_cast<Fl_Round_Button*>(self))->handle(event);+  Fl_DerivedRound_Button::Fl_DerivedRound_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Round_Button(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedRound_Button::Fl_DerivedRound_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Round_Button(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedRound_Button::~Fl_DerivedRound_Button(){+    free(overriddenFuncs);+  }+  void Fl_DerivedRound_Button::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Round_Button) this);+    }+    else {+      Fl_Round_Button::draw();+    }+  }++  void Fl_DerivedRound_Button::draw_super(){+    Fl_Round_Button::draw();+  }++  int Fl_DerivedRound_Button::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Round_Button) this,event);+    }+    else {+      i = Fl_Round_Button::handle(event);+    }+    return i;+  }+  int Fl_DerivedRound_Button::handle_super(int event){+    return Fl_Round_Button::handle(event);+  }++  void Fl_DerivedRound_Button::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Round_Button) this,x,y,w,h);+    }+    else {+      Fl_Round_Button::resize(x,y,w,h);+    }+  }++  void Fl_DerivedRound_Button::resize_super(int x, int y, int w, int h){+    Fl_Round_Button::resize(x,y,w,h);+  }+  void Fl_DerivedRound_Button::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Round_Button) this);+    }+    else {+      Fl_Round_Button::show();+    }+  }+  void Fl_DerivedRound_Button::show_super(){+    Fl_Round_Button::show();+  }++  void Fl_DerivedRound_Button::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Round_Button) this);+    }+    else {+      Fl_Round_Button::hide();+    }+  }+  void Fl_DerivedRound_Button::hide_super(){+    Fl_Round_Button::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Round_Button_parent)(fl_Round_Button b){     return (fl_Group) (static_cast<Fl_Round_Button*>(b))->parent();   }@@ -266,14 +338,6 @@   FL_EXPORT_C(fl_Gl_Window,Fl_Round_Button_as_gl_window)(fl_Round_Button round_button){     return (fl_Gl_Window) (static_cast<Fl_Round_Button*>(round_button))->as_gl_window();   }-  FL_EXPORT_C(fl_Round_Button, Fl_Round_Button_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Round_Button* button = new Fl_Round_Button(x,y,w,h,label);-    return (static_cast<fl_Round_Button>(button));-  }-  FL_EXPORT_C(fl_Round_Button, Fl_Round_Button_New)(int x, int y, int w, int h) {-    Fl_Round_Button* button = new Fl_Round_Button(x,y,w,h,0);-    return (fl_Round_Button)button;-  }   FL_EXPORT_C(void,Fl_Round_Button_Destroy)(fl_Round_Button button){     delete (static_cast<Fl_Round_Button*>(button));   }@@ -307,6 +371,55 @@   FL_EXPORT_C(void,Fl_Round_Button_set_down_color)(fl_Round_Button b,Fl_Color c){     (static_cast<Fl_Round_Button*>(b))->down_color(c);   }+  FL_EXPORT_C(fl_Round_Button,    Fl_Round_Button_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedRound_Button* w = new Fl_DerivedRound_Button(X,Y,W,H,fs);+    return (fl_Round_Button)w;+  }+  FL_EXPORT_C(fl_Round_Button,    Fl_Round_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedRound_Button* w = new Fl_DerivedRound_Button(X,Y,W,H,label,fs);+    return (fl_Round_Button)w;+  }+  FL_EXPORT_C(fl_Round_Button,    Fl_OverriddenRound_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedRound_Button* w = new Fl_DerivedRound_Button(X,Y,W,H,fs);+    return (fl_Round_Button)w;+  }+  FL_EXPORT_C(fl_Round_Button,    Fl_OverriddenRound_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedRound_Button* w = new Fl_DerivedRound_Button(X,Y,W,H,label,fs);+    return (fl_Round_Button)w;+  }+  FL_EXPORT_C(void, Fl_Round_Button_draw)(fl_Round_Button o){+    (static_cast<Fl_DerivedRound_Button*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Round_Button_draw_super)(fl_Round_Button o){+    (static_cast<Fl_DerivedRound_Button*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Round_Button_handle)(fl_Round_Button o, int event){+    return (static_cast<Fl_DerivedRound_Button*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Round_Button_handle_super)(fl_Round_Button o, int event){+    return (static_cast<Fl_DerivedRound_Button*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Round_Button_resize)(fl_Round_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedRound_Button*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Round_Button_resize_super)(fl_Round_Button o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedRound_Button*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Round_Button_show)(fl_Round_Button o){+    (static_cast<Fl_DerivedRound_Button*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Round_Button_show_super)(fl_Round_Button o){+    (static_cast<Fl_DerivedRound_Button*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Round_Button_hide)(fl_Round_Button o){+    (static_cast<Fl_DerivedRound_Button*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Round_Button_hide_super)(fl_Round_Button o){+    (static_cast<Fl_DerivedRound_Button*>(o))->hide_super();+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Round_Button.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedRound_Button : public Fl_Round_Button {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedRound_Button(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedRound_Button(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedRound_Button();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Round_Button_handle)(fl_Round_Button self, int event);@@ -109,6 +128,18 @@   FL_EXPORT_C(void        , Fl_Round_Button_set_down_box)(fl_Round_Button b,Fl_Boxtype boxtype);   FL_EXPORT_C(Fl_Color    , Fl_Round_Button_down_color )(fl_Round_Button b);   FL_EXPORT_C(void        , Fl_Round_Button_set_down_color)(fl_Round_Button b, Fl_Color c);+  FL_EXPORT_C(fl_Round_Button,    Fl_OverriddenRound_Button_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Round_Button,    Fl_OverriddenRound_Button_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Round_Button_draw)(fl_Round_Button o);+  FL_EXPORT_C(void, Fl_Round_Button_draw_super)(fl_Round_Button o);+  FL_EXPORT_C(int, Fl_Round_Button_handle)(fl_Round_Button o, int event);+  FL_EXPORT_C(int, Fl_Round_Button_handle_super)(fl_Round_Button o, int event);+  FL_EXPORT_C(void, Fl_Round_Button_resize)(fl_Round_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Round_Button_resize_super)(fl_Round_Button o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Round_Button_show)(fl_Round_Button o);+  FL_EXPORT_C(void, Fl_Round_Button_show_super)(fl_Round_Button o);+  FL_EXPORT_C(void, Fl_Round_Button_hide)(fl_Round_Button o);+  FL_EXPORT_C(void, Fl_Round_Button_hide_super)(fl_Round_Button o); #ifdef __cplusplus } #endif

@@ -1,6 +1,79 @@ #include "Fl_ScrollC.h" #ifdef __cplusplus EXPORT {+  Fl_DerivedScroll::Fl_DerivedScroll(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Scroll(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedScroll::Fl_DerivedScroll(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Scroll(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedScroll::~Fl_DerivedScroll(){+    free(overriddenFuncs);+  }+  void Fl_DerivedScroll::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Scroll) this);+    }+    else {+      Fl_Scroll::draw();+    }+  }++  void Fl_DerivedScroll::draw_super(){+    Fl_Scroll::draw();+  }++  int Fl_DerivedScroll::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Scroll) this,event);+    }+    else {+      i = Fl_Scroll::handle(event);+    }+    return i;+  }+  int Fl_DerivedScroll::handle_super(int event){+    return Fl_Scroll::handle(event);+  }++  void Fl_DerivedScroll::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Scroll) this,x,y,w,h);+    }+    else {+      Fl_Scroll::resize(x,y,w,h);+    }+  }++  void Fl_DerivedScroll::resize_super(int x, int y, int w, int h){+    Fl_Scroll::resize(x,y,w,h);+  }+  void Fl_DerivedScroll::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Scroll) this);+    }+    else {+      Fl_Scroll::show();+    }+  }+  void Fl_DerivedScroll::show_super(){+    Fl_Scroll::show();+  }++  void Fl_DerivedScroll::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Scroll) this);+    }+    else {+      Fl_Scroll::hide();+    }+  }+  void Fl_DerivedScroll::hide_super(){+    Fl_Scroll::hide();+  } #endif   FL_EXPORT_C(void,Fl_Scroll_set_scrollbar_size)(fl_Scroll widget,int size){     (static_cast<Fl_Scroll*>(widget))->scrollbar_size(size);@@ -26,19 +99,53 @@   FL_EXPORT_C(void,Fl_Scroll_set_type)(fl_Scroll widget,uchar t){     (static_cast<Fl_Scroll*>(widget))->type(t);   }-  FL_EXPORT_C(void,Fl_Scroll_resize)(fl_Scroll scroll,int X,int Y,int W,int H){-    (static_cast<Fl_Scroll*>(scroll))->resize(X,Y,W,H);+  FL_EXPORT_C(fl_Scroll,    Fl_Scroll_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedScroll* w = new Fl_DerivedScroll(X,Y,W,H,fs);+    return (fl_Scroll)w;   }-  FL_EXPORT_C(int,Fl_Scroll_handle)(fl_Scroll self,int event){-    return (static_cast<Fl_Scroll*>(self))->handle(event);+  FL_EXPORT_C(fl_Scroll,    Fl_Scroll_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedScroll* w = new Fl_DerivedScroll(X,Y,W,H,label,fs);+    return (fl_Scroll)w;   }-  FL_EXPORT_C(fl_Scroll,Fl_Scroll_New_WithLabel)(int x,int y,int w,int h,const char* label){-    Fl_Scroll* scroll = new Fl_Scroll(x,y,w,h,label);-    return (static_cast<fl_Scroll>(scroll));+  FL_EXPORT_C(fl_Scroll,    Fl_OverriddenScroll_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedScroll* w = new Fl_DerivedScroll(X,Y,W,H,fs);+    return (fl_Scroll)w;   }-  FL_EXPORT_C(fl_Scroll,Fl_Scroll_New)(int x,int y,int w,int h){-    Fl_Scroll* scroll = new Fl_Scroll(x,y,w,h);-    return (static_cast<fl_Scroll>(scroll));+  FL_EXPORT_C(fl_Scroll,    Fl_OverriddenScroll_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedScroll* w = new Fl_DerivedScroll(X,Y,W,H,label,fs);+    return (fl_Scroll)w;+  }+  FL_EXPORT_C(void, Fl_Scroll_draw)(fl_Scroll o){+    (static_cast<Fl_DerivedScroll*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Scroll_draw_super)(fl_Scroll o){+    (static_cast<Fl_DerivedScroll*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Scroll_handle)(fl_Scroll o, int event){+    return (static_cast<Fl_DerivedScroll*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Scroll_handle_super)(fl_Scroll o, int event){+    return (static_cast<Fl_DerivedScroll*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Scroll_resize)(fl_Scroll o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedScroll*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Scroll_resize_super)(fl_Scroll o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedScroll*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Scroll_show)(fl_Scroll o){+    (static_cast<Fl_DerivedScroll*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Scroll_show_super)(fl_Scroll o){+    (static_cast<Fl_DerivedScroll*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Scroll_hide)(fl_Scroll o){+    (static_cast<Fl_DerivedScroll*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Scroll_hide_super)(fl_Scroll o){+    (static_cast<Fl_DerivedScroll*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Scroll.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedScroll : public Fl_Scroll {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedScroll(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedScroll(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedScroll();+  }; #endif   FL_EXPORT_C(void,        Fl_Scroll_set_scrollbar_size)(fl_Scroll widget, int size);   FL_EXPORT_C(int,         Fl_Scroll_get_scrollbar_size)(fl_Scroll widget);@@ -21,6 +40,18 @@   FL_EXPORT_C(int,Fl_Scroll_handle)(fl_Scroll scroll, int event);   FL_EXPORT_C(fl_Scroll,    Fl_Scroll_New_WithLabel)(int x, int y, int w, int h, const char* label);   FL_EXPORT_C(fl_Scroll,    Fl_Scroll_New)(int x, int y, int w, int h);+  FL_EXPORT_C(fl_Scroll,    Fl_OverriddenScroll_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Scroll,    Fl_OverriddenScroll_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Scroll_draw)(fl_Scroll o);+  FL_EXPORT_C(void, Fl_Scroll_draw_super)(fl_Scroll o);+  FL_EXPORT_C(int, Fl_Scroll_handle)(fl_Scroll o, int event);+  FL_EXPORT_C(int, Fl_Scroll_handle_super)(fl_Scroll o, int event);+  FL_EXPORT_C(void, Fl_Scroll_resize)(fl_Scroll o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Scroll_resize_super)(fl_Scroll o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Scroll_show)(fl_Scroll o);+  FL_EXPORT_C(void, Fl_Scroll_show_super)(fl_Scroll o);+  FL_EXPORT_C(void, Fl_Scroll_hide)(fl_Scroll o);+  FL_EXPORT_C(void, Fl_Scroll_hide_super)(fl_Scroll o); #ifdef __cplusplus } #endif

@@ -1,19 +1,80 @@ #include "Fl_ScrollbarC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Scrollbar_handle )(fl_Scrollbar slider, int event){-    return (static_cast<Fl_Scrollbar*>(slider))->handle(event);+  Fl_DerivedScrollbar::Fl_DerivedScrollbar(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Scrollbar(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Scrollbar_resize )(fl_Scrollbar slider,int x, int y, int w, int h){-    (static_cast<Fl_Scrollbar*>(slider))->resize(x,y,w,h);+  Fl_DerivedScrollbar::Fl_DerivedScrollbar(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Scrollbar(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Scrollbar_show )(fl_Scrollbar slider){-    (static_cast<Fl_Scrollbar*>(slider))->show();+  Fl_DerivedScrollbar::~Fl_DerivedScrollbar(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Scrollbar_hide )(fl_Scrollbar slider){-    (static_cast<Fl_Scrollbar*>(slider))->hide();+  void Fl_DerivedScrollbar::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Scrollbar) this);+    }+    else {+      Fl_Scrollbar::draw();+    }   }++  void Fl_DerivedScrollbar::draw_super(){+    Fl_Scrollbar::draw();+  }++  int Fl_DerivedScrollbar::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Scrollbar) this,event);+    }+    else {+      i = Fl_Scrollbar::handle(event);+    }+    return i;+  }+  int Fl_DerivedScrollbar::handle_super(int event){+    return Fl_Scrollbar::handle(event);+  }++  void Fl_DerivedScrollbar::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Scrollbar) this,x,y,w,h);+    }+    else {+      Fl_Scrollbar::resize(x,y,w,h);+    }+  }++  void Fl_DerivedScrollbar::resize_super(int x, int y, int w, int h){+    Fl_Scrollbar::resize(x,y,w,h);+  }+  void Fl_DerivedScrollbar::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Scrollbar) this);+    }+    else {+      Fl_Scrollbar::show();+    }+  }+  void Fl_DerivedScrollbar::show_super(){+    Fl_Scrollbar::show();+  }++  void Fl_DerivedScrollbar::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Scrollbar) this);+    }+    else {+      Fl_Scrollbar::hide();+    }+  }+  void Fl_DerivedScrollbar::hide_super(){+    Fl_Scrollbar::hide();+  }+#endif   FL_EXPORT_C(fl_Window,Fl_Scrollbar_as_window )(fl_Scrollbar slider){     return (static_cast<Fl_Scrollbar*>(slider))->as_window();   }@@ -327,14 +388,6 @@   FL_EXPORT_C(double,Fl_Scrollbar_increment)(fl_Scrollbar slider,double v,int n){     return (static_cast<Fl_Scrollbar*>(slider))->increment(v,n);   }-  FL_EXPORT_C(fl_Scrollbar, Fl_Scrollbar_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Scrollbar* slider = new Fl_Scrollbar(x,y,w,h,label);-    return (static_cast<fl_Scrollbar>(slider));-  }-  FL_EXPORT_C(fl_Scrollbar, Fl_Scrollbar_New)(int x, int y, int w, int h) {-    Fl_Scrollbar* slider = new Fl_Scrollbar(x,y,w,h,0);-    return (fl_Scrollbar)slider;-  }   FL_EXPORT_C(void,      Fl_Scrollbar_Destroy)(fl_Scrollbar slider){     delete (static_cast<Fl_Scrollbar*>(slider));   }@@ -358,6 +411,54 @@   }   FL_EXPORT_C(int  , Fl_Scrollbar_linesize)(fl_Scrollbar slider){     return (static_cast<Fl_Scrollbar*>(slider))->linesize();+  }+  FL_EXPORT_C(void, Fl_Scrollbar_draw)(fl_Scrollbar o){+    (static_cast<Fl_DerivedScrollbar*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Scrollbar_draw_super)(fl_Scrollbar o){+    (static_cast<Fl_DerivedScrollbar*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Scrollbar_handle)(fl_Scrollbar o, int event){+    return (static_cast<Fl_DerivedScrollbar*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Scrollbar_handle_super)(fl_Scrollbar o, int event){+    return (static_cast<Fl_DerivedScrollbar*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Scrollbar_resize)(fl_Scrollbar o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedScrollbar*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Scrollbar_resize_super)(fl_Scrollbar o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedScrollbar*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Scrollbar_show)(fl_Scrollbar o){+    (static_cast<Fl_DerivedScrollbar*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Scrollbar_show_super)(fl_Scrollbar o){+    (static_cast<Fl_DerivedScrollbar*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Scrollbar_hide)(fl_Scrollbar o){+    (static_cast<Fl_DerivedScrollbar*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Scrollbar_hide_super)(fl_Scrollbar o){+    (static_cast<Fl_DerivedScrollbar*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Scrollbar,    Fl_Scrollbar_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedScrollbar* w = new Fl_DerivedScrollbar(X,Y,W,H,fs);+    return (fl_Scrollbar)w;+  }+  FL_EXPORT_C(fl_Scrollbar,    Fl_Scrollbar_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedScrollbar* w = new Fl_DerivedScrollbar(X,Y,W,H,label,fs);+    return (fl_Scrollbar)w;+  }+  FL_EXPORT_C(fl_Scrollbar,    Fl_OverriddenScrollbar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedScrollbar* w = new Fl_DerivedScrollbar(X,Y,W,H,fs);+    return (fl_Scrollbar)w;+  }+  FL_EXPORT_C(fl_Scrollbar,    Fl_OverriddenScrollbar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedScrollbar* w = new Fl_DerivedScrollbar(X,Y,W,H,label,fs);+    return (fl_Scrollbar)w;   } #ifdef __cplusplus }

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Scrollbar.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedScrollbar : public Fl_Scrollbar {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedScrollbar(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedScrollbar(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedScrollbar();+  }; #endif   FL_EXPORT_C(int,Fl_Scrollbar_handle)(fl_Widget self, int event);   FL_EXPORT_C(fl_Group,     Fl_Scrollbar_parent)(fl_Scrollbar slider);@@ -124,6 +143,18 @@   FL_EXPORT_C(void, Fl_Scrollbar_set_slider)(fl_Scrollbar slider, Fl_Boxtype c);   FL_EXPORT_C(void, Fl_Scrollbar_set_linesize)(fl_Scrollbar slider, int i);   FL_EXPORT_C(int  , Fl_Scrollbar_linesize)(fl_Scrollbar slider);+  FL_EXPORT_C(fl_Scrollbar,    Fl_OverriddenScrollbar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Scrollbar,    Fl_OverriddenScrollbar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Scrollbar_draw)(fl_Scrollbar o);+  FL_EXPORT_C(void, Fl_Scrollbar_draw_super)(fl_Scrollbar o);+  FL_EXPORT_C(int, Fl_Scrollbar_handle)(fl_Scrollbar o, int event);+  FL_EXPORT_C(int, Fl_Scrollbar_handle_super)(fl_Scrollbar o, int event);+  FL_EXPORT_C(void, Fl_Scrollbar_resize)(fl_Scrollbar o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Scrollbar_resize_super)(fl_Scrollbar o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Scrollbar_show)(fl_Scrollbar o);+  FL_EXPORT_C(void, Fl_Scrollbar_show_super)(fl_Scrollbar o);+  FL_EXPORT_C(void, Fl_Scrollbar_hide)(fl_Scrollbar o);+  FL_EXPORT_C(void, Fl_Scrollbar_hide_super)(fl_Scrollbar o); #ifdef __cplusplus } #endif

@@ -1,31 +1,80 @@ #include "Fl_SliderC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Slider_handle_super)(fl_Slider slider,int event){-    return (static_cast<Fl_Slider*>(slider))->Fl_Slider::handle(event);+  Fl_DerivedSlider::Fl_DerivedSlider(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Slider(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(int,Fl_Slider_handle )(fl_Slider slider, int event){-    return (static_cast<Fl_Slider*>(slider))->handle(event);+  Fl_DerivedSlider::Fl_DerivedSlider(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Slider(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Slider_resize_super )(fl_Slider slider,int x, int y, int w, int h){-    (static_cast<Fl_Slider*>(slider))->Fl_Slider::resize(x,y,w,h);+  Fl_DerivedSlider::~Fl_DerivedSlider(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Slider_resize )(fl_Slider slider,int x, int y, int w, int h){-    (static_cast<Fl_Slider*>(slider))->resize(x,y,w,h);+  void Fl_DerivedSlider::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Slider) this);+    }+    else {+      Fl_Slider::draw();+    }   }-  FL_EXPORT_C(void,Fl_Slider_show_super)(fl_Slider slider){-    (static_cast<Fl_Slider*>(slider))->Fl_Slider::show();++  void Fl_DerivedSlider::draw_super(){+    Fl_Slider::draw();   }-  FL_EXPORT_C(void,Fl_Slider_show )(fl_Slider slider){-    (static_cast<Fl_Slider*>(slider))->show();++  int Fl_DerivedSlider::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Slider) this,event);+    }+    else {+      i = Fl_Slider::handle(event);+    }+    return i;   }-  FL_EXPORT_C(void,Fl_Slider_hide_super)(fl_Slider slider){-    (static_cast<Fl_Slider*>(slider))->Fl_Slider::hide();+  int Fl_DerivedSlider::handle_super(int event){+    return Fl_Slider::handle(event);   }-  FL_EXPORT_C(void,Fl_Slider_hide )(fl_Slider slider){-    (static_cast<Fl_Slider*>(slider))->hide();++  void Fl_DerivedSlider::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Slider) this,x,y,w,h);+    }+    else {+      Fl_Slider::resize(x,y,w,h);+    }   }++  void Fl_DerivedSlider::resize_super(int x, int y, int w, int h){+    Fl_Slider::resize(x,y,w,h);+  }+  void Fl_DerivedSlider::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Slider) this);+    }+    else {+      Fl_Slider::show();+    }+  }+  void Fl_DerivedSlider::show_super(){+    Fl_Slider::show();+  }++  void Fl_DerivedSlider::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Slider) this);+    }+    else {+      Fl_Slider::hide();+    }+  }+  void Fl_DerivedSlider::hide_super(){+    Fl_Slider::hide();+  }+#endif   FL_EXPORT_C(fl_Window,Fl_Slider_as_window_super)(fl_Slider slider){     return (static_cast<Fl_Slider*>(slider))->Fl_Slider::as_window();   }@@ -345,14 +394,6 @@   FL_EXPORT_C(double,Fl_Slider_increment)(fl_Slider slider,double v,int n){     return (static_cast<Fl_Slider*>(slider))->increment(v,n);   }-  FL_EXPORT_C(fl_Slider, Fl_Slider_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Slider* slider = new Fl_Slider(x,y,w,h,label);-    return (static_cast<fl_Slider>(slider));-  }-  FL_EXPORT_C(fl_Slider, Fl_Slider_New)(int x, int y, int w, int h) {-    Fl_Slider* slider = new Fl_Slider(x,y,w,h,0);-    return (fl_Slider)slider;-  }   FL_EXPORT_C(fl_Slider,    Fl_Slider_New_WithT)(uchar t, int x, int y, int w, int h, const char* label){     Fl_Slider* slider = new Fl_Slider(t,x,y,w,h,label);     return (fl_Slider)slider;@@ -414,6 +455,54 @@   }   FL_EXPORT_C(void,Fl_Slider_set_slider)(fl_Slider slider,Fl_Boxtype c){     (static_cast<Fl_Slider*>(slider))->slider(c);+  }+  FL_EXPORT_C(fl_Slider,    Fl_Slider_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedSlider* w = new Fl_DerivedSlider(X,Y,W,H,fs);+    return (fl_Slider)w;+  }+  FL_EXPORT_C(fl_Slider,    Fl_Slider_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedSlider* w = new Fl_DerivedSlider(X,Y,W,H,label,fs);+    return (fl_Slider)w;+  }+  FL_EXPORT_C(fl_Slider,    Fl_OverriddenSlider_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedSlider* w = new Fl_DerivedSlider(X,Y,W,H,fs);+    return (fl_Slider)w;+  }+  FL_EXPORT_C(fl_Slider,    Fl_OverriddenSlider_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedSlider* w = new Fl_DerivedSlider(X,Y,W,H,label,fs);+    return (fl_Slider)w;+  }+  FL_EXPORT_C(void, Fl_Slider_draw)(fl_Slider o){+    (static_cast<Fl_DerivedSlider*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Slider_draw_super)(fl_Slider o){+    (static_cast<Fl_DerivedSlider*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Slider_handle)(fl_Slider o, int event){+    return (static_cast<Fl_DerivedSlider*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Slider_handle_super)(fl_Slider o, int event){+    return (static_cast<Fl_DerivedSlider*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Slider_resize)(fl_Slider o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedSlider*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Slider_resize_super)(fl_Slider o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedSlider*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Slider_show)(fl_Slider o){+    (static_cast<Fl_DerivedSlider*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Slider_show_super)(fl_Slider o){+    (static_cast<Fl_DerivedSlider*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Slider_hide)(fl_Slider o){+    (static_cast<Fl_DerivedSlider*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Slider_hide_super)(fl_Slider o){+    (static_cast<Fl_DerivedSlider*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -12,7 +12,26 @@ #include "FL/Fl_Hor_Nice_Slider.H" #include "FL/Fl_Nice_Slider.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedSlider : public Fl_Slider {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedSlider(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedSlider(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedSlider();+  }; #endif   FL_EXPORT_C(int,Fl_Slider_handle)(fl_Widget self, int event);   FL_EXPORT_C(int,Fl_Slider_handle_super)(fl_Widget self, int event);@@ -143,6 +162,18 @@   FL_EXPORT_C(void, Fl_Slider_slider_size)(fl_Slider slider, double v);   FL_EXPORT_C(Fl_Boxtype, Fl_Slider_slider)(fl_Slider slider);   FL_EXPORT_C(void, Fl_Slider_set_slider)(fl_Slider slider, Fl_Boxtype c);+  FL_EXPORT_C(fl_Slider,    Fl_OverriddenSlider_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Slider,    Fl_OverriddenSlider_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Slider_draw)(fl_Slider o);+  FL_EXPORT_C(void, Fl_Slider_draw_super)(fl_Slider o);+  FL_EXPORT_C(int, Fl_Slider_handle)(fl_Slider o, int event);+  FL_EXPORT_C(int, Fl_Slider_handle_super)(fl_Slider o, int event);+  FL_EXPORT_C(void, Fl_Slider_resize)(fl_Slider o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Slider_resize_super)(fl_Slider o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Slider_show)(fl_Slider o);+  FL_EXPORT_C(void, Fl_Slider_show_super)(fl_Slider o);+  FL_EXPORT_C(void, Fl_Slider_hide)(fl_Slider o);+  FL_EXPORT_C(void, Fl_Slider_hide_super)(fl_Slider o); #ifdef __cplusplus } #endif

@@ -1,6 +1,79 @@ #include "Fl_SpinnerC.h" #ifdef __cplusplus EXPORT {+  Fl_DerivedSpinner::Fl_DerivedSpinner(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Spinner(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedSpinner::Fl_DerivedSpinner(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Spinner(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedSpinner::~Fl_DerivedSpinner(){+    free(overriddenFuncs);+  }+  void Fl_DerivedSpinner::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Spinner) this);+    }+    else {+      Fl_Spinner::draw();+    }+  }++  void Fl_DerivedSpinner::draw_super(){+    Fl_Spinner::draw();+  }++  int Fl_DerivedSpinner::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Spinner) this,event);+    }+    else {+      i = Fl_Spinner::handle(event);+    }+    return i;+  }+  int Fl_DerivedSpinner::handle_super(int event){+    return Fl_Spinner::handle(event);+  }++  void Fl_DerivedSpinner::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Spinner) this,x,y,w,h);+    }+    else {+      Fl_Spinner::resize(x,y,w,h);+    }+  }++  void Fl_DerivedSpinner::resize_super(int x, int y, int w, int h){+    Fl_Spinner::resize(x,y,w,h);+  }+  void Fl_DerivedSpinner::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Spinner) this);+    }+    else {+      Fl_Spinner::show();+    }+  }+  void Fl_DerivedSpinner::show_super(){+    Fl_Spinner::show();+  }++  void Fl_DerivedSpinner::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Spinner) this);+    }+    else {+      Fl_Spinner::hide();+    }+  }+  void Fl_DerivedSpinner::hide_super(){+    Fl_Spinner::hide();+  } #endif   FL_EXPORT_C(Fl_Color,Fl_Spinner_color)(fl_Spinner spinner){     return (static_cast<Fl_Spinner*>(spinner))->color();@@ -20,9 +93,6 @@   FL_EXPORT_C(void,Fl_Spinner_set_type)(fl_Spinner spinner,uchar t){     (static_cast<Fl_Spinner*>(spinner))->type(t);   }-  FL_EXPORT_C(void,Fl_Spinner_resize)(fl_Spinner spinner,int X,int Y,int W,int H){-    (static_cast<Fl_Spinner*>(spinner))->resize(X,Y,W,H);-  }   FL_EXPORT_C(double,Fl_Spinner_minimum)(fl_Spinner spinner){     return (static_cast<Fl_Spinner*>(spinner))->minimum();   }@@ -74,16 +144,53 @@   FL_EXPORT_C(Fl_Color,Fl_Spinner_textcolor)(fl_Spinner spinner){     return (static_cast<Fl_Spinner*>(spinner))->textcolor();   }-  FL_EXPORT_C(int,Fl_Spinner_handle)(fl_Spinner spinner,int event){-    return (static_cast<Fl_Spinner*>(spinner))->handle(event);+  FL_EXPORT_C(fl_Spinner,    Fl_Spinner_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedSpinner* w = new Fl_DerivedSpinner(X,Y,W,H,fs);+    return (fl_Spinner)w;   }-  FL_EXPORT_C(fl_Spinner,Fl_Spinner_New_WithLabel)(int x,int y,int w,int h,const char* label){-    Fl_Spinner* counter = new Fl_Spinner(x,y,w,h,label);-    return (fl_Spinner) counter;+  FL_EXPORT_C(fl_Spinner,    Fl_Spinner_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedSpinner* w = new Fl_DerivedSpinner(X,Y,W,H,label,fs);+    return (fl_Spinner)w;   }-  FL_EXPORT_C(fl_Spinner,Fl_Spinner_New)(int x,int y,int w,int h){-    Fl_Spinner* counter = new Fl_Spinner(x,y,w,h);-    return (fl_Spinner) counter;+  FL_EXPORT_C(fl_Spinner,    Fl_OverriddenSpinner_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedSpinner* w = new Fl_DerivedSpinner(X,Y,W,H,fs);+    return (fl_Spinner)w;+  }+  FL_EXPORT_C(fl_Spinner,    Fl_OverriddenSpinner_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedSpinner* w = new Fl_DerivedSpinner(X,Y,W,H,label,fs);+    return (fl_Spinner)w;+  }+  FL_EXPORT_C(void, Fl_Spinner_draw)(fl_Spinner o){+    (static_cast<Fl_DerivedSpinner*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Spinner_draw_super)(fl_Spinner o){+    (static_cast<Fl_DerivedSpinner*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Spinner_handle)(fl_Spinner o, int event){+    return (static_cast<Fl_DerivedSpinner*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Spinner_handle_super)(fl_Spinner o, int event){+    return (static_cast<Fl_DerivedSpinner*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Spinner_resize)(fl_Spinner o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedSpinner*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Spinner_resize_super)(fl_Spinner o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedSpinner*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Spinner_show)(fl_Spinner o){+    (static_cast<Fl_DerivedSpinner*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Spinner_show_super)(fl_Spinner o){+    (static_cast<Fl_DerivedSpinner*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Spinner_hide)(fl_Spinner o){+    (static_cast<Fl_DerivedSpinner*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Spinner_hide_super)(fl_Spinner o){+    (static_cast<Fl_DerivedSpinner*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,7 +7,27 @@ #include "FL/Fl.H" #include "FL/Fl_Spinner.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedSpinner : public Fl_Spinner {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedSpinner(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedSpinner(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedSpinner();+  };+ #endif #ifndef INTERNAL_LINKAGE   typedef enum Spinner_Type {@@ -42,6 +62,18 @@   FL_EXPORT_C(Fl_Color,     Fl_Spinner_textcolor)(fl_Spinner spinner);   FL_EXPORT_C(fl_Spinner,    Fl_Spinner_New_WithLabel)(int x, int y, int w, int h, const char* label);   FL_EXPORT_C(fl_Spinner   , Fl_Spinner_New)(int x, int y, int w, int h);+  FL_EXPORT_C(fl_Spinner,    Fl_OverriddenSpinner_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Spinner,    Fl_OverriddenSpinner_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Spinner_draw)(fl_Spinner o);+  FL_EXPORT_C(void, Fl_Spinner_draw_super)(fl_Spinner o);+  FL_EXPORT_C(int, Fl_Spinner_handle)(fl_Spinner o, int event);+  FL_EXPORT_C(int, Fl_Spinner_handle_super)(fl_Spinner o, int event);+  FL_EXPORT_C(void, Fl_Spinner_resize)(fl_Spinner o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Spinner_resize_super)(fl_Spinner o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Spinner_show)(fl_Spinner o);+  FL_EXPORT_C(void, Fl_Spinner_show_super)(fl_Spinner o);+  FL_EXPORT_C(void, Fl_Spinner_hide)(fl_Spinner o);+  FL_EXPORT_C(void, Fl_Spinner_hide_super)(fl_Spinner o); #ifdef __cplusplus } #endif

@@ -2,19 +2,80 @@ #include "UtilsC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Sys_Menu_Bar_handle )(fl_Sys_Menu_Bar sys_menu_bar, int event){-    return (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->handle(event);+  Fl_DerivedSys_Menu_Bar::Fl_DerivedSys_Menu_Bar(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Sys_Menu_Bar(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Sys_Menu_Bar_resize )(fl_Sys_Menu_Bar sys_menu_bar,int x, int y, int w, int h){-    (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->resize(x,y,w,h);+  Fl_DerivedSys_Menu_Bar::Fl_DerivedSys_Menu_Bar(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Sys_Menu_Bar(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }-  FL_EXPORT_C(void,Fl_Sys_Menu_Bar_show )(fl_Sys_Menu_Bar sys_menu_bar){-    (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->show();+  Fl_DerivedSys_Menu_Bar::~Fl_DerivedSys_Menu_Bar(){+    free(overriddenFuncs);   }-  FL_EXPORT_C(void,Fl_Sys_Menu_Bar_hide )(fl_Sys_Menu_Bar sys_menu_bar){-    (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->hide();+  void Fl_DerivedSys_Menu_Bar::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Sys_Menu_Bar) this);+    }+    else {+      Fl_Sys_Menu_Bar::draw();+    }   }++  void Fl_DerivedSys_Menu_Bar::draw_super(){+    Fl_Sys_Menu_Bar::draw();+  }++  int Fl_DerivedSys_Menu_Bar::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Sys_Menu_Bar) this,event);+    }+    else {+      i = Fl_Sys_Menu_Bar::handle(event);+    }+    return i;+  }+  int Fl_DerivedSys_Menu_Bar::handle_super(int event){+    return Fl_Sys_Menu_Bar::handle(event);+  }++  void Fl_DerivedSys_Menu_Bar::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Sys_Menu_Bar) this,x,y,w,h);+    }+    else {+      Fl_Sys_Menu_Bar::resize(x,y,w,h);+    }+  }++  void Fl_DerivedSys_Menu_Bar::resize_super(int x, int y, int w, int h){+    Fl_Sys_Menu_Bar::resize(x,y,w,h);+  }+  void Fl_DerivedSys_Menu_Bar::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Sys_Menu_Bar) this);+    }+    else {+      Fl_Sys_Menu_Bar::show();+    }+  }+  void Fl_DerivedSys_Menu_Bar::show_super(){+    Fl_Sys_Menu_Bar::show();+  }++  void Fl_DerivedSys_Menu_Bar::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Sys_Menu_Bar) this);+    }+    else {+      Fl_Sys_Menu_Bar::hide();+    }+  }+  void Fl_DerivedSys_Menu_Bar::hide_super(){+    Fl_Sys_Menu_Bar::hide();+  }+#endif   FL_EXPORT_C(fl_Window,Fl_Sys_Menu_Bar_as_window )(fl_Sys_Menu_Bar sys_menu_bar){     return (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->as_window();   }@@ -265,14 +326,6 @@   FL_EXPORT_C(void,Fl_Sys_Menu_Bar_measure_label)(fl_Sys_Menu_Bar sys_menu_bar,int* ww,int* hh){     (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->measure_label(*ww,*hh);   }-  FL_EXPORT_C(fl_Sys_Menu_Bar, Fl_Sys_Menu_Bar_New_WithLabel)(int x, int y, int w, int h, const char* label) {-    Fl_Sys_Menu_Bar* sys_menu_bar = new Fl_Sys_Menu_Bar(x,y,w,h,label);-    return (static_cast<fl_Sys_Menu_Bar>(sys_menu_bar));-  }-  FL_EXPORT_C(fl_Sys_Menu_Bar, Fl_Sys_Menu_Bar_New)(int x, int y, int w, int h) {-    Fl_Sys_Menu_Bar* sys_menu_bar = new Fl_Sys_Menu_Bar(x,y,w,h,0);-    return (fl_Sys_Menu_Bar)sys_menu_bar;-  }   FL_EXPORT_C(void   , Fl_Sys_Menu_Bar_Destroy)(fl_Sys_Menu_Bar sys_menu_bar){     delete (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar));   }@@ -438,6 +491,54 @@   }   FL_EXPORT_C(void,Fl_Sys_Menu_Bar_set_down_color)(fl_Sys_Menu_Bar sys_menu_bar,unsigned c){     (static_cast<Fl_Sys_Menu_Bar*>(sys_menu_bar))->down_color(c);+  }+  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_Sys_Menu_Bar_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedSys_Menu_Bar* w = new Fl_DerivedSys_Menu_Bar(X,Y,W,H,fs);+    return (fl_Sys_Menu_Bar)w;+  }+  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_Sys_Menu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedSys_Menu_Bar* w = new Fl_DerivedSys_Menu_Bar(X,Y,W,H,label,fs);+    return (fl_Sys_Menu_Bar)w;+  }+  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_OverriddenSys_Menu_Bar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedSys_Menu_Bar* w = new Fl_DerivedSys_Menu_Bar(X,Y,W,H,fs);+    return (fl_Sys_Menu_Bar)w;+  }+  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_OverriddenSys_Menu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedSys_Menu_Bar* w = new Fl_DerivedSys_Menu_Bar(X,Y,W,H,label,fs);+    return (fl_Sys_Menu_Bar)w;+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_draw)(fl_Sys_Menu_Bar o){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_draw_super)(fl_Sys_Menu_Bar o){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_handle)(fl_Sys_Menu_Bar o, int event){+    return (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_handle_super)(fl_Sys_Menu_Bar o, int event){+    return (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_resize)(fl_Sys_Menu_Bar o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_resize_super)(fl_Sys_Menu_Bar o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_show)(fl_Sys_Menu_Bar o){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_show_super)(fl_Sys_Menu_Bar o){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_hide)(fl_Sys_Menu_Bar o){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_hide_super)(fl_Sys_Menu_Bar o){+    (static_cast<Fl_DerivedSys_Menu_Bar*>(o))->hide_super();   } #ifdef __cplusplus }

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Sys_Menu_Bar.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedSys_Menu_Bar : public Fl_Sys_Menu_Bar {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedSys_Menu_Bar(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedSys_Menu_Bar(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedSys_Menu_Bar();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,          Fl_Sys_Menu_Bar_handle)(fl_Group self, int event);@@ -157,6 +176,18 @@   FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_down_box)(fl_Sys_Menu_Bar sys_menu_bar, Fl_Boxtype b);   FL_EXPORT_C(Fl_Color, Fl_Sys_Menu_Bar_down_color)(fl_Sys_Menu_Bar sys_menu_bar);   FL_EXPORT_C(void, Fl_Sys_Menu_Bar_set_down_color)(fl_Sys_Menu_Bar sys_menu_bar, unsigned c);+  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_OverriddenSys_Menu_Bar_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Sys_Menu_Bar,    Fl_OverriddenSys_Menu_Bar_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_draw)(fl_Sys_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_draw_super)(fl_Sys_Menu_Bar o);+  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_handle)(fl_Sys_Menu_Bar o, int event);+  FL_EXPORT_C(int, Fl_Sys_Menu_Bar_handle_super)(fl_Sys_Menu_Bar o, int event);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_resize)(fl_Sys_Menu_Bar o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_resize_super)(fl_Sys_Menu_Bar o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_show)(fl_Sys_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_show_super)(fl_Sys_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_hide)(fl_Sys_Menu_Bar o);+  FL_EXPORT_C(void, Fl_Sys_Menu_Bar_hide_super)(fl_Sys_Menu_Bar o); #ifdef __cplusplus } #endif

@@ -1,13 +1,13 @@ #include "Fl_Table_RowC.h" #ifdef __cplusplus Fl_DerivedTable_Row::Fl_DerivedTable_Row(int X, int Y, int W, int H, const char *l, fl_Table_Virtual_Funcs* funcs) : Fl_Table_Row(X,Y,W,H,l){-    overriddenFuncs = funcs;-    other_data = (void*)"INIT";- }+  overriddenFuncs = funcs;+  other_data = (void*)"INIT";+} Fl_DerivedTable_Row::Fl_DerivedTable_Row(int X, int Y, int W, int H, fl_Table_Virtual_Funcs* funcs):Fl_Table_Row(X,Y,W,H,0){-    overriddenFuncs = funcs;-    other_data = (void*)"INIT";-  }+  overriddenFuncs = funcs;+  other_data = (void*)"INIT";+} Fl_DerivedTable_Row::~Fl_DerivedTable_Row(){   destroy_data();   free(overriddenFuncs);@@ -199,28 +199,27 @@   FL_EXPORT_C(void,Fl_Table_Row_set_parent)(fl_Table_Row table_row,fl_Group grp){     (static_cast<Fl_DerivedTable_Row*>(table_row))->parent((static_cast<Fl_Group*>(grp)));   }--FL_EXPORT_C(void, Fl_Table_Row_draw_box)(fl_Table_Row Table_Row){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_box();-}-FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_tc)(fl_Table_Row Table_Row,Fl_Boxtype t, Fl_Color c){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_box(t,c);-}-FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_txywhc)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_box(t,x,y,w,h,c);-}-FL_EXPORT_C(void, Fl_Table_Row_draw_backdrop)(fl_Table_Row Table_Row){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_backdrop();-}-FL_EXPORT_C(void, Fl_Table_Row_draw_focus)(fl_Table_Row Table_Row){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_focus();-}-FL_EXPORT_C(void, Fl_Table_Row_draw_focus_with_txywh)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_focus(t,x,y,w,h);-}-FL_EXPORT_C(void, Fl_Table_Row_draw_label)(fl_Table_Row Table_Row){- (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_label();-}+  FL_EXPORT_C(void, Fl_Table_Row_draw_box)(fl_Table_Row Table_Row){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_box();+  }+  FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_tc)(fl_Table_Row Table_Row,Fl_Boxtype t, Fl_Color c){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_box(t,c);+  }+  FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_txywhc)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_box(t,x,y,w,h,c);+  }+  FL_EXPORT_C(void, Fl_Table_Row_draw_backdrop)(fl_Table_Row Table_Row){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_backdrop();+  }+  FL_EXPORT_C(void, Fl_Table_Row_draw_focus)(fl_Table_Row Table_Row){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_focus();+  }+  FL_EXPORT_C(void, Fl_Table_Row_draw_focus_with_txywh)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_focus(t,x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Table_Row_draw_label)(fl_Table_Row Table_Row){+    (static_cast<Fl_DerivedTable_Row*>(Table_Row))->draw_label();+  }   FL_EXPORT_C(int,Fl_Table_Row_x)(fl_Table_Row table_row){     return (static_cast<Fl_DerivedTable_Row*>(table_row))->x();   }

@@ -14,14 +14,14 @@   FL_EXPORT_C(int,Fl_Table_Row_handle)(fl_Table_Row self, int event);   FL_EXPORT_C(fl_Group,     Fl_Table_Row_parent)(fl_Table_Row table);   FL_EXPORT_C(void,         Fl_Table_Row_set_parent)(fl_Table_Row table, fl_Group grp);+  FL_EXPORT_C(void, Fl_Table_Row_draw_box)(fl_Table_Row Table_Row);+  FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_tc)(fl_Table_Row Table_Row,Fl_Boxtype t, Fl_Color c);+  FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_txywhc)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);+  FL_EXPORT_C(void, Fl_Table_Row_draw_backdrop)(fl_Table_Row Table_Row);+  FL_EXPORT_C(void, Fl_Table_Row_draw_focus)(fl_Table_Row Table_Row);+  FL_EXPORT_C(void, Fl_Table_Row_draw_focus_with_txywh)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h);+  FL_EXPORT_C(void, Fl_Table_Row_draw_label)(fl_Table_Row Table_Row); -FL_EXPORT_C(void, Fl_Table_Row_draw_box)(fl_Table_Row Table_Row);-FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_tc)(fl_Table_Row Table_Row,Fl_Boxtype t, Fl_Color c);-FL_EXPORT_C(void, Fl_Table_Row_draw_box_with_txywhc)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c);-FL_EXPORT_C(void, Fl_Table_Row_draw_backdrop)(fl_Table_Row Table_Row);-FL_EXPORT_C(void, Fl_Table_Row_draw_focus)(fl_Table_Row Table_Row);-FL_EXPORT_C(void, Fl_Table_Row_draw_focus_with_txywh)(fl_Table_Row Table_Row,Fl_Boxtype t, int x,int y,int w,int h);-FL_EXPORT_C(void, Fl_Table_Row_draw_label)(fl_Table_Row Table_Row);   FL_EXPORT_C(int,          Fl_Table_Row_x)(fl_Table_Row table);   FL_EXPORT_C(int,          Fl_Table_Row_y)(fl_Table_Row table);   FL_EXPORT_C(int,          Fl_Table_Row_w)(fl_Table_Row table);@@ -118,6 +118,7 @@   FL_EXPORT_C(unsigned int, Fl_Table_Row_clip_children)(fl_Table_Row table);   FL_EXPORT_C(void,         Fl_Table_Row_focus)(fl_Table_Row table,fl_Widget W);   FL_EXPORT_C(fl_Widget,    Fl_Table_Row__ddfdesign_kludge)(fl_Table_Row table);+  FL_EXPORT_C(void,Fl_Table_Row_draw_super)(fl_Table_Row table_row);    FL_EXPORT_C(void,         Fl_Table_Row_insert_with_before)(fl_Table_Row self, fl_Widget w, fl_Widget before);   FL_EXPORT_C(fl_Widget*, Fl_Table_Row_array)(fl_Table_Row self);

@@ -1,10 +1,82 @@ #include "Fl_TabsC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Tabs_handle)(fl_Tabs self, int event){-    return (static_cast<Fl_Tabs*>(self))->handle(event);+  Fl_DerivedTabs::Fl_DerivedTabs(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Tabs(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedTabs::Fl_DerivedTabs(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Tabs(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedTabs::~Fl_DerivedTabs(){+    free(overriddenFuncs);+  }+  void Fl_DerivedTabs::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Tabs) this);+    }+    else {+      Fl_Tabs::draw();+    }+  }++  void Fl_DerivedTabs::draw_super(){+    Fl_Tabs::draw();+  }++  int Fl_DerivedTabs::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Tabs) this,event);+    }+    else {+      i = Fl_Tabs::handle(event);+    }+    return i;+  }+  int Fl_DerivedTabs::handle_super(int event){+    return Fl_Tabs::handle(event);+  }++  void Fl_DerivedTabs::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Tabs) this,x,y,w,h);+    }+    else {+      Fl_Tabs::resize(x,y,w,h);+    }+  }++  void Fl_DerivedTabs::resize_super(int x, int y, int w, int h){+    Fl_Tabs::resize(x,y,w,h);+  }+  void Fl_DerivedTabs::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Tabs) this);+    }+    else {+      Fl_Tabs::show();+    }+  }+  void Fl_DerivedTabs::show_super(){+    Fl_Tabs::show();+  }++  void Fl_DerivedTabs::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Tabs) this);+    }+    else {+      Fl_Tabs::hide();+    }+  }+  void Fl_DerivedTabs::hide_super(){+    Fl_Tabs::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Tabs_parent)(fl_Tabs tabs){     return (fl_Group) (static_cast<Fl_Tabs*>(tabs))->parent();   }@@ -297,17 +369,6 @@   FL_EXPORT_C(fl_Widget, Fl_Tabs_child)(fl_Tabs self, int n){     return (fl_Widget)(static_cast<Fl_Tabs*>(self))->child(n);   }-  // FL_EXPORT_C(void     , Fl_Tabs_forms_end)(fl_Tabs self){-  //   (static_cast<Fl_Tabs*>(self))->forms_end();-  // }-  FL_EXPORT_C(fl_Tabs, Fl_Tabs_New)(int x, int y, int w, int h){-    Fl_Tabs* t = new Fl_Tabs(x,y,w,h);-    return (fl_Tabs)t;-  }-  FL_EXPORT_C(fl_Tabs, Fl_Tabs_New_WithLabel)(int x, int y, int w, int h, const char* l){-    Fl_Tabs* t = new Fl_Tabs(x,y,w,h,l);-    return (fl_Tabs)t;-  }   FL_EXPORT_C(fl_Widget,Fl_Tabs_value)(fl_Tabs tabs){     return (fl_Widget)(static_cast<Fl_Tabs*>(tabs))->value();   }@@ -329,6 +390,55 @@   FL_EXPORT_C(void,Fl_Tabs_client_area_with_tabh)(fl_Tabs tabs,int* rx,int* ry,int* rw,int* rh,int tabh){     (static_cast<Fl_Tabs*>(tabs))->client_area(*rx,*ry,*rw,*rh,tabh);   }+  FL_EXPORT_C(void, Fl_Tabs_draw)(fl_Tabs o){+    (static_cast<Fl_DerivedTabs*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Tabs_draw_super)(fl_Tabs o){+    (static_cast<Fl_DerivedTabs*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Tabs_handle)(fl_Tabs o, int event){+    return (static_cast<Fl_DerivedTabs*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Tabs_handle_super)(fl_Tabs o, int event){+    return (static_cast<Fl_DerivedTabs*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Tabs_resize)(fl_Tabs o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedTabs*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Tabs_resize_super)(fl_Tabs o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedTabs*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Tabs_show)(fl_Tabs o){+    (static_cast<Fl_DerivedTabs*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Tabs_show_super)(fl_Tabs o){+    (static_cast<Fl_DerivedTabs*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Tabs_hide)(fl_Tabs o){+    (static_cast<Fl_DerivedTabs*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Tabs_hide_super)(fl_Tabs o){+    (static_cast<Fl_DerivedTabs*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Tabs,    Fl_Tabs_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedTabs* w = new Fl_DerivedTabs(X,Y,W,H,fs);+    return (fl_Tabs)w;+  }+  FL_EXPORT_C(fl_Tabs,    Fl_Tabs_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedTabs* w = new Fl_DerivedTabs(X,Y,W,H,label,fs);+    return (fl_Tabs)w;+  }+  FL_EXPORT_C(fl_Tabs,    Fl_OverriddenTabs_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedTabs* w = new Fl_DerivedTabs(X,Y,W,H,fs);+    return (fl_Tabs)w;+  }+  FL_EXPORT_C(fl_Tabs,    Fl_OverriddenTabs_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedTabs* w = new Fl_DerivedTabs(X,Y,W,H,label,fs);+    return (fl_Tabs)w;+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,27 @@ #include "FL/Fl.H" #include "FL/Fl_Tabs.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedTabs : public Fl_Tabs {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedTabs(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedTabs(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedTabs();+  };+ #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,Fl_Tabs_handle)(fl_Tabs self, int event);@@ -124,6 +144,18 @@   FL_EXPORT_C(fl_Widget, Fl_Tabs_which)(fl_Tabs tabs, int event_x, int event_y);   FL_EXPORT_C(void, Fl_Tabs_client_area)(fl_Tabs tabs, int* rx, int* ry, int* rw, int* rh);   FL_EXPORT_C(void, Fl_Tabs_client_area_with_tabh)(fl_Tabs tabs, int* rx, int* ry, int* rw, int* rh, int tabh);+  FL_EXPORT_C(fl_Tabs,    Fl_OverriddenTabs_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Tabs,    Fl_OverriddenTabs_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Tabs_draw)(fl_Tabs o);+  FL_EXPORT_C(void, Fl_Tabs_draw_super)(fl_Tabs o);+  FL_EXPORT_C(int, Fl_Tabs_handle)(fl_Tabs o, int event);+  FL_EXPORT_C(int, Fl_Tabs_handle_super)(fl_Tabs o, int event);+  FL_EXPORT_C(void, Fl_Tabs_resize)(fl_Tabs o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Tabs_resize_super)(fl_Tabs o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Tabs_show)(fl_Tabs o);+  FL_EXPORT_C(void, Fl_Tabs_show_super)(fl_Tabs o);+  FL_EXPORT_C(void, Fl_Tabs_hide)(fl_Tabs o);+  FL_EXPORT_C(void, Fl_Tabs_hide_super)(fl_Tabs o); #ifdef __cplusplus } #endif

@@ -1,10 +1,82 @@ #include "Fl_Text_DisplayC.h" #ifdef __cplusplus EXPORT {-#endif-  FL_EXPORT_C(int,Fl_Text_Display_handle)(fl_Text_Display self, int event){-    return (static_cast<Fl_Text_Display*>(self))->handle(event);+  Fl_DerivedText_Display::Fl_DerivedText_Display(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs) : Fl_Text_Display(X,Y,W,H,l){+    overriddenFuncs = funcs;+    other_data = (void*)0;   }+  Fl_DerivedText_Display::Fl_DerivedText_Display(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs):Fl_Text_Display(X,Y,W,H){+    overriddenFuncs = funcs;+    other_data = (void*)0;+  }+  Fl_DerivedText_Display::~Fl_DerivedText_Display(){+    free(overriddenFuncs);+  }+  void Fl_DerivedText_Display::draw(){+    if (this->overriddenFuncs->draw != NULL) {+      this->overriddenFuncs->draw((fl_Text_Display) this);+    }+    else {+      Fl_Text_Display::draw();+    }+  }++  void Fl_DerivedText_Display::draw_super(){+    Fl_Text_Display::draw();+  }++  int Fl_DerivedText_Display::handle(int event){+    int i;+    if (this->overriddenFuncs->handle != NULL) {+      i = this->overriddenFuncs->handle((fl_Text_Display) this,event);+    }+    else {+      i = Fl_Text_Display::handle(event);+    }+    return i;+  }+  int Fl_DerivedText_Display::handle_super(int event){+    return Fl_Text_Display::handle(event);+  }++  void Fl_DerivedText_Display::resize(int x, int y, int w, int h){+    if (this->overriddenFuncs->resize != NULL) {+      this->overriddenFuncs->resize((fl_Text_Display) this,x,y,w,h);+    }+    else {+      Fl_Text_Display::resize(x,y,w,h);+    }+  }++  void Fl_DerivedText_Display::resize_super(int x, int y, int w, int h){+    Fl_Text_Display::resize(x,y,w,h);+  }+  void Fl_DerivedText_Display::show(){+    if (this->overriddenFuncs->show != NULL) {+      this->overriddenFuncs->show((fl_Text_Display) this);+    }+    else {+      Fl_Text_Display::show();+    }+  }+  void Fl_DerivedText_Display::show_super(){+    Fl_Text_Display::show();+  }++  void Fl_DerivedText_Display::hide(){+    if (this->overriddenFuncs->hide != NULL) {+      this->overriddenFuncs->hide((fl_Text_Display) this);+    }+    else {+      Fl_Text_Display::hide();+    }+  }+  void Fl_DerivedText_Display::hide_super(){+    Fl_Text_Display::hide();+  }+++#endif   FL_EXPORT_C(fl_Group,Fl_Text_Display_parent)(fl_Text_Display text_display){     return (fl_Group) (static_cast<Fl_Text_Display*>(text_display))->parent();   }@@ -301,9 +373,6 @@   FL_EXPORT_C(void,Fl_Text_Display_init_sizes)(fl_Text_Display text_display){     (static_cast<Fl_Text_Display*>(text_display))->init_sizes();   }-  FL_EXPORT_C(void,Fl_Text_Display_resize)(fl_Text_Display text_display, int X, int Y, int W, int H){-    (static_cast<Fl_Text_Display*>(text_display))->resize(X,Y,W,H);-  }   FL_EXPORT_C(int,Fl_Text_Display_children)(fl_Text_Display self){     return (static_cast<Fl_Text_Display*>(self))->children();   }@@ -325,14 +394,6 @@   FL_EXPORT_C(fl_Widget, Fl_Text_Display_child)(fl_Text_Display self, int n){     return (fl_Widget)(static_cast<Fl_Text_Display*>(self))->child(n);   }-  FL_EXPORT_C(fl_Text_Display,     Fl_Text_Display_New)(int x, int y, int w, int h){-    Fl_Text_Display* g = new Fl_Text_Display(x,y,w,h);-    return (fl_Text_Display)g;-  }-  FL_EXPORT_C(fl_Text_Display,     Fl_Text_Display_New_WithLabel)(int x, int y, int w, int h, const char* t){-    Fl_Text_Display* g = new Fl_Text_Display(x,y,w,h,t);-    return (fl_Text_Display)g;-  }   FL_EXPORT_C(void, Fl_Text_Display_Destroy)(fl_Text_Display text_display){     delete (static_cast<Fl_Text_Display*>(text_display));   }@@ -496,48 +557,97 @@   FL_EXPORT_C(double,Fl_Text_Display_col_to_x)(fl_Text_Display text_display,double col){     return (static_cast<Fl_Text_Display*>(text_display))->col_to_x(col);   }- FL_EXPORT_C(void,set_linenumber_width)(fl_Text_Display text_display,int width){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_width(width);- }- FL_EXPORT_C(int         ,linenumber_width)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_width();- }- FL_EXPORT_C(void        ,set_linenumber_font)(fl_Text_Display text_display,Fl_Font val){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_font(val);- }- FL_EXPORT_C(Fl_Font     ,linenumber_font)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_font();- }- FL_EXPORT_C(void        ,set_linenumber_size)(fl_Text_Display text_display,Fl_Fontsize val){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_size(val);- }- FL_EXPORT_C(Fl_Fontsize ,linenumber_size)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_size();- }- FL_EXPORT_C(void        ,set_linenumber_fgcolor)(fl_Text_Display text_display,Fl_Color val){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_fgcolor(val);- }- FL_EXPORT_C(Fl_Color    ,linenumber_fgcolor)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_fgcolor();- }- FL_EXPORT_C(void        ,set_linenumber_bgcolor)(fl_Text_Display text_display,Fl_Color val){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_bgcolor(val);- }- FL_EXPORT_C(Fl_Color    ,linenumber_bgcolor)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_bgcolor();- }- FL_EXPORT_C(void        ,set_linenumber_align)(fl_Text_Display text_display,Fl_Align val){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_align(val);- }- FL_EXPORT_C(Fl_Align    ,linenumber_align)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_align();- }- FL_EXPORT_C(void        ,set_linenumber_format)(fl_Text_Display text_display,const char* val){-   (static_cast<Fl_Text_Display*>(text_display))->linenumber_format(val);- }- FL_EXPORT_C(const char* ,linenumber_format)(fl_Text_Display text_display){-   return (static_cast<Fl_Text_Display*>(text_display))->linenumber_format();- }+  FL_EXPORT_C(void,set_linenumber_width)(fl_Text_Display text_display,int width){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_width(width);+  }+  FL_EXPORT_C(int         ,linenumber_width)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_width();+  }+  FL_EXPORT_C(void        ,set_linenumber_font)(fl_Text_Display text_display,Fl_Font val){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_font(val);+  }+  FL_EXPORT_C(Fl_Font     ,linenumber_font)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_font();+  }+  FL_EXPORT_C(void        ,set_linenumber_size)(fl_Text_Display text_display,Fl_Fontsize val){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_size(val);+  }+  FL_EXPORT_C(Fl_Fontsize ,linenumber_size)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_size();+  }+  FL_EXPORT_C(void        ,set_linenumber_fgcolor)(fl_Text_Display text_display,Fl_Color val){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_fgcolor(val);+  }+  FL_EXPORT_C(Fl_Color    ,linenumber_fgcolor)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_fgcolor();+  }+  FL_EXPORT_C(void        ,set_linenumber_bgcolor)(fl_Text_Display text_display,Fl_Color val){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_bgcolor(val);+  }+  FL_EXPORT_C(Fl_Color    ,linenumber_bgcolor)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_bgcolor();+  }+  FL_EXPORT_C(void        ,set_linenumber_align)(fl_Text_Display text_display,Fl_Align val){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_align(val);+  }+  FL_EXPORT_C(Fl_Align    ,linenumber_align)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_align();+  }+  FL_EXPORT_C(void        ,set_linenumber_format)(fl_Text_Display text_display,const char* val){+    (static_cast<Fl_Text_Display*>(text_display))->linenumber_format(val);+  }+  FL_EXPORT_C(const char* ,linenumber_format)(fl_Text_Display text_display){+    return (static_cast<Fl_Text_Display*>(text_display))->linenumber_format();+  }+  FL_EXPORT_C(fl_Text_Display,    Fl_Text_Display_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedText_Display* w = new Fl_DerivedText_Display(X,Y,W,H,fs);+    return (fl_Text_Display)w;+  }+  FL_EXPORT_C(fl_Text_Display,    Fl_Text_Display_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    Fl_DerivedText_Display* w = new Fl_DerivedText_Display(X,Y,W,H,label,fs);+    return (fl_Text_Display)w;+  }+  FL_EXPORT_C(fl_Text_Display,    Fl_OverriddenText_Display_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedText_Display* w = new Fl_DerivedText_Display(X,Y,W,H,fs);+    return (fl_Text_Display)w;+  }+  FL_EXPORT_C(fl_Text_Display,    Fl_OverriddenText_Display_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    Fl_DerivedText_Display* w = new Fl_DerivedText_Display(X,Y,W,H,label,fs);+    return (fl_Text_Display)w;+  }+  FL_EXPORT_C(void, Fl_Text_Display_draw)(fl_Text_Display o){+    (static_cast<Fl_DerivedText_Display*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Text_Display_draw_super)(fl_Text_Display o){+    (static_cast<Fl_DerivedText_Display*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Text_Display_handle)(fl_Text_Display o, int event){+    return (static_cast<Fl_DerivedText_Display*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Text_Display_handle_super)(fl_Text_Display o, int event){+    return (static_cast<Fl_DerivedText_Display*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Text_Display_resize)(fl_Text_Display o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedText_Display*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Text_Display_resize_super)(fl_Text_Display o, int x, int y, int w, int h){+    (static_cast<Fl_DerivedText_Display*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Text_Display_show)(fl_Text_Display o){+    (static_cast<Fl_DerivedText_Display*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Text_Display_show_super)(fl_Text_Display o){+    (static_cast<Fl_DerivedText_Display*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Text_Display_hide)(fl_Text_Display o){+    (static_cast<Fl_DerivedText_Display*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Text_Display_hide_super)(fl_Text_Display o){+    (static_cast<Fl_DerivedText_Display*>(o))->hide_super();+  }+ #ifdef __cplusplus } #endif

@@ -7,7 +7,26 @@ #include "FL/Fl.H" #include "FL/Fl_Text_Display.H" #include "Fl_CallbackC.h"+#include "Fl_WidgetC.h" EXPORT {+  class Fl_DerivedText_Display : public Fl_Text_Display {+    fl_Widget_Virtual_Funcs* overriddenFuncs;+    void* other_data;+  public:+    virtual void draw();+    void draw_super();+    virtual int handle(int event);+    int handle_super(int event);+    virtual void resize(int x, int y, int w, int h);+    void resize_super(int x, int y, int w, int h);+    virtual void show();+    void show_super();+    virtual void hide();+    void hide_super();+    Fl_DerivedText_Display(int X, int Y, int W, int H, const char *l, fl_Widget_Virtual_Funcs* funcs);+    Fl_DerivedText_Display(int X, int Y, int W, int H, fl_Widget_Virtual_Funcs* funcs);+    ~Fl_DerivedText_Display();+  }; #endif   /* Inherited from Fl_Widget */   FL_EXPORT_C(int,          Fl_Text_Display_handle)(fl_Text_Display self, int event);@@ -193,6 +212,18 @@   FL_EXPORT_C(Fl_Align    ,linenumber_align)(fl_Text_Display text_display);   FL_EXPORT_C(void        ,set_linenumber_format)(fl_Text_Display text_display,const char* val);   FL_EXPORT_C(const char* ,linenumber_format)(fl_Text_Display text_display);+  FL_EXPORT_C(fl_Text_Display,    Fl_OverriddenText_Display_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(fl_Text_Display,    Fl_OverriddenText_Display_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs);+  FL_EXPORT_C(void, Fl_Text_Display_draw)(fl_Text_Display o);+  FL_EXPORT_C(void, Fl_Text_Display_draw_super)(fl_Text_Display o);+  FL_EXPORT_C(int, Fl_Text_Display_handle)(fl_Text_Display o, int event);+  FL_EXPORT_C(int, Fl_Text_Display_handle_super)(fl_Text_Display o, int event);+  FL_EXPORT_C(void, Fl_Text_Display_resize)(fl_Text_Display o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Text_Display_resize_super)(fl_Text_Display o, int x, int y, int w, int h);+  FL_EXPORT_C(void, Fl_Text_Display_show)(fl_Text_Display o);+  FL_EXPORT_C(void, Fl_Text_Display_show_super)(fl_Text_Display o);+  FL_EXPORT_C(void, Fl_Text_Display_hide)(fl_Text_Display o);+  FL_EXPORT_C(void, Fl_Text_Display_hide_super)(fl_Text_Display o); #ifdef __cplusplus } #endif

@@ -35,9 +35,6 @@ } EXPORT { #endif-  FL_EXPORT_C(int,Fl_Text_Editor_handle)(fl_Text_Editor self, int event){-    return (static_cast<DerivedText_Editor*>(self))->handle(event);-  }   FL_EXPORT_C(fl_Group,Fl_Text_Editor_parent)(fl_Text_Editor win){     return (fl_Group) (static_cast<DerivedText_Editor*>(win))->parent();   }@@ -355,14 +352,6 @@   FL_EXPORT_C(fl_Widget, Fl_Text_Editor_child)(fl_Text_Editor self, int n){     return (fl_Widget)(static_cast<DerivedText_Editor*>(self))->child(n);   }-  FL_EXPORT_C(fl_Text_Editor,     Fl_Text_Editor_New)(int x, int y, int w, int h){-    DerivedText_Editor* g = new DerivedText_Editor(x,y,w,h);-    return (fl_Text_Editor)g;-  }-  FL_EXPORT_C(fl_Text_Editor,     Fl_Text_Editor_New_WithLabel)(int x, int y, int w, int h, const char* t){-    DerivedText_Editor* g = new DerivedText_Editor(x,y,w,h,t);-    return (fl_Text_Editor)g;-  }   FL_EXPORT_C(void,     Fl_Text_Editor_Destroy)(fl_Text_Editor text_editor){     delete (static_cast<DerivedText_Editor*>(text_editor));   }@@ -523,136 +512,184 @@   FL_EXPORT_C(double,Fl_Text_Editor_col_to_x)(fl_Text_Editor text_editor,double col){     return (static_cast<DerivedText_Editor*>(text_editor))->col_to_x(col);   }- FL_EXPORT_C(void,Fl_Text_Editor_set_insert_mode)(fl_Text_Editor text_editor,int b){-   (static_cast<DerivedText_Editor*>(text_editor))->insert_mode(b);- }- FL_EXPORT_C(int,Fl_Text_Editor_insert_mode)(fl_Text_Editor text_editor){-   return (static_cast<DerivedText_Editor*>(text_editor))->insert_mode();- }- FL_EXPORT_C(int, Fl_Text_Editor_num_key_bindings)(Key_BindingC* bindings){-   int count = 0;-   Key_BindingC* curr = bindings;-   for (;curr;curr = curr->next){-     if (curr) {-       count++;-     }-   }-   return count;- }- FL_EXPORT_C(void,Fl_Text_Editor_add_key_binding_with_list)(fl_Text_Editor text_editor,int key,int state,fl_Key_Func f,Key_BindingC* list){-   DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);-   DerivedText_Editor* e =  (static_cast<DerivedText_Editor*>(text_editor));-   C_to_Fl_Callback* context = new C_to_Fl_Callback(f);-   e->add_key_binding(key,state,context,&bs);- }- FL_EXPORT_C(void,Fl_Text_Editor_add_key_binding)(fl_Text_Editor text_editor,int key,int state,fl_Key_Func f){-   C_to_Fl_Callback* context = new C_to_Fl_Callback(f);-   (static_cast<DerivedText_Editor*>(text_editor))->add_key_binding(key,state,context);- }- FL_EXPORT_C(void,Fl_Text_Editor_remove_key_binding_with_list)(fl_Text_Editor text_editor,int key,int state,Key_BindingC* list){-   DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);-   (static_cast<DerivedText_Editor*>(text_editor))->remove_key_binding(key,state,&bs);- }- FL_EXPORT_C(void,Fl_Text_Editor_remove_key_binding)(fl_Text_Editor text_editor,int key,int state){-   (static_cast<DerivedText_Editor*>(text_editor))->remove_key_binding(key,state);- }- FL_EXPORT_C(void,Fl_Text_Editor_remove_all_key_bindings_with_list)(fl_Text_Editor text_editor,Key_BindingC* list){-   DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);-   (static_cast<DerivedText_Editor*>(text_editor))->remove_all_key_bindings(&bs);- }- FL_EXPORT_C(void,Fl_Text_Editor_remove_all_key_bindings)(fl_Text_Editor text_editor){-   (static_cast<DerivedText_Editor*>(text_editor))->remove_all_key_bindings();- }- FL_EXPORT_C(void,Fl_Text_Editor_replace_key_bindings)(fl_Text_Editor text_editor, Key_BindingC* list){-   DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);-   (static_cast<DerivedText_Editor*>(text_editor))->replace_key_bindings(&bs);- }- FL_EXPORT_C(void,Fl_Text_Editor_replace_key_bindings_with_list)(fl_Text_Editor text_editor, Key_BindingC* list1, Key_BindingC* list2){-   DerivedText_Editor::Key_Binding_With_Callback* bs1 = convertKeyBindings(list1);-   DerivedText_Editor::Key_Binding_With_Callback* bs2 = convertKeyBindings(list2);-   (static_cast<DerivedText_Editor*>(text_editor))->replace_key_bindings(&bs1,&bs2);- }- FL_EXPORT_C(Key_BindingC* ,Fl_Text_Editor_add_default_key_bindings)(fl_Text_Editor text_editor,Key_BindingC* list){-   DerivedText_Editor::Key_Binding_With_Callback* bs_ = new DerivedText_Editor::Key_Binding_With_Callback();-   (static_cast<DerivedText_Editor*>(text_editor))->add_default_key_bindings(&bs_);-   list = convertKeyBindings(bs_);-   return list;- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_undo)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_undo(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_ignore)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_ignore(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_backspace)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_backspace(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_enter)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_enter(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_move)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_move(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_shift_move)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_shift_move(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_ctrl_move)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_ctrl_move(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_c_s_move)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_c_s_move(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_meta_move)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_meta_move(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_m_s_move)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_m_s_move(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_home)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_home(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_end)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_end(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_left)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_left(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_up)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_up(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_right)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_right(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_down)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_down(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_page_up)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_page_up(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_page_down)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_page_down(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_insert)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_insert(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_delete)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_delete(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_copy)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_copy(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_cut)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_cut(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_paste)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_paste(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_select_all)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_select_all(c,(static_cast<DerivedText_Editor*>(e)));- }- FL_EXPORT_C(int,Fl_Text_Editor_kf_default)(int c,fl_Text_Editor e){-   return Fl_Text_Editor::kf_default(c,(static_cast<DerivedText_Editor*>(e)));- }+  FL_EXPORT_C(void,Fl_Text_Editor_set_insert_mode)(fl_Text_Editor text_editor,int b){+    (static_cast<DerivedText_Editor*>(text_editor))->insert_mode(b);+  }+  FL_EXPORT_C(int,Fl_Text_Editor_insert_mode)(fl_Text_Editor text_editor){+    return (static_cast<DerivedText_Editor*>(text_editor))->insert_mode();+  }+  FL_EXPORT_C(int, Fl_Text_Editor_num_key_bindings)(Key_BindingC* bindings){+    int count = 0;+    Key_BindingC* curr = bindings;+    for (;curr;curr = curr->next){+      if (curr) {+        count++;+      }+    }+    return count;+  }+  FL_EXPORT_C(void,Fl_Text_Editor_add_key_binding_with_list)(fl_Text_Editor text_editor,int key,int state,fl_Key_Func f,Key_BindingC* list){+    DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);+    DerivedText_Editor* e =  (static_cast<DerivedText_Editor*>(text_editor));+    C_to_Fl_Callback* context = new C_to_Fl_Callback(f);+    e->add_key_binding(key,state,context,&bs);+  }+  FL_EXPORT_C(void,Fl_Text_Editor_add_key_binding)(fl_Text_Editor text_editor,int key,int state,fl_Key_Func f){+    C_to_Fl_Callback* context = new C_to_Fl_Callback(f);+    (static_cast<DerivedText_Editor*>(text_editor))->add_key_binding(key,state,context);+  }+  FL_EXPORT_C(void,Fl_Text_Editor_remove_key_binding_with_list)(fl_Text_Editor text_editor,int key,int state,Key_BindingC* list){+    DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);+    (static_cast<DerivedText_Editor*>(text_editor))->remove_key_binding(key,state,&bs);+  }+  FL_EXPORT_C(void,Fl_Text_Editor_remove_key_binding)(fl_Text_Editor text_editor,int key,int state){+    (static_cast<DerivedText_Editor*>(text_editor))->remove_key_binding(key,state);+  }+  FL_EXPORT_C(void,Fl_Text_Editor_remove_all_key_bindings_with_list)(fl_Text_Editor text_editor,Key_BindingC* list){+    DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);+    (static_cast<DerivedText_Editor*>(text_editor))->remove_all_key_bindings(&bs);+  }+  FL_EXPORT_C(void,Fl_Text_Editor_remove_all_key_bindings)(fl_Text_Editor text_editor){+    (static_cast<DerivedText_Editor*>(text_editor))->remove_all_key_bindings();+  }+  FL_EXPORT_C(void,Fl_Text_Editor_replace_key_bindings)(fl_Text_Editor text_editor, Key_BindingC* list){+    DerivedText_Editor::Key_Binding_With_Callback* bs = convertKeyBindings(list);+    (static_cast<DerivedText_Editor*>(text_editor))->replace_key_bindings(&bs);+  }+  FL_EXPORT_C(void,Fl_Text_Editor_replace_key_bindings_with_list)(fl_Text_Editor text_editor, Key_BindingC* list1, Key_BindingC* list2){+    DerivedText_Editor::Key_Binding_With_Callback* bs1 = convertKeyBindings(list1);+    DerivedText_Editor::Key_Binding_With_Callback* bs2 = convertKeyBindings(list2);+    (static_cast<DerivedText_Editor*>(text_editor))->replace_key_bindings(&bs1,&bs2);+  }+  FL_EXPORT_C(Key_BindingC* ,Fl_Text_Editor_add_default_key_bindings)(fl_Text_Editor text_editor,Key_BindingC* list){+    DerivedText_Editor::Key_Binding_With_Callback* bs_ = new DerivedText_Editor::Key_Binding_With_Callback();+    (static_cast<DerivedText_Editor*>(text_editor))->add_default_key_bindings(&bs_);+    list = convertKeyBindings(bs_);+    return list;+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_undo)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_undo(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_ignore)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_ignore(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_backspace)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_backspace(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_enter)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_enter(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_move)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_move(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_shift_move)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_shift_move(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_ctrl_move)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_ctrl_move(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_c_s_move)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_c_s_move(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_meta_move)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_meta_move(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_m_s_move)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_m_s_move(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_home)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_home(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_end)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_end(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_left)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_left(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_up)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_up(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_right)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_right(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_down)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_down(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_page_up)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_page_up(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_page_down)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_page_down(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_insert)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_insert(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_delete)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_delete(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_copy)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_copy(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_cut)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_cut(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_paste)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_paste(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_select_all)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_select_all(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(int,Fl_Text_Editor_kf_default)(int c,fl_Text_Editor e){+    return Fl_Text_Editor::kf_default(c,(static_cast<DerivedText_Editor*>(e)));+  }+  FL_EXPORT_C(void, Fl_Text_Editor_draw)(fl_Text_Editor o){+    (static_cast<DerivedText_Editor*>(o))->draw();+  }+  FL_EXPORT_C(void, Fl_Text_Editor_draw_super)(fl_Text_Editor o){+    (static_cast<DerivedText_Editor*>(o))->draw_super();+  }+  FL_EXPORT_C(int, Fl_Text_Editor_handle)(fl_Text_Editor o, int event){+    return (static_cast<DerivedText_Editor*>(o))->handle(event);+  }+  FL_EXPORT_C(int, Fl_Text_Editor_handle_super)(fl_Text_Editor o, int event){+    return (static_cast<DerivedText_Editor*>(o))->handle_super(event);+  }+  FL_EXPORT_C(void, Fl_Text_Editor_resize)(fl_Text_Editor o, int x, int y, int w, int h){+    (static_cast<DerivedText_Editor*>(o))->resize(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Text_Editor_resize_super)(fl_Text_Editor o, int x, int y, int w, int h){+    (static_cast<DerivedText_Editor*>(o))->resize_super(x,y,w,h);+  }+  FL_EXPORT_C(void, Fl_Text_Editor_show)(fl_Text_Editor o){+    (static_cast<DerivedText_Editor*>(o))->show();+  }+  FL_EXPORT_C(void, Fl_Text_Editor_show_super)(fl_Text_Editor o){+    (static_cast<DerivedText_Editor*>(o))->show_super();+  }+  FL_EXPORT_C(void, Fl_Text_Editor_hide)(fl_Text_Editor o){+    (static_cast<DerivedText_Editor*>(o))->hide();+  }+  FL_EXPORT_C(void, Fl_Text_Editor_hide_super)(fl_Text_Editor o){+    (static_cast<DerivedText_Editor*>(o))->hide_super();+  }+  FL_EXPORT_C(fl_Text_Editor,    Fl_Text_Editor_New)(int X, int Y, int W, int H){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    DerivedText_Editor* w = new DerivedText_Editor(X,Y,W,H,fs);+    return (fl_Text_Editor)w;+  }+  FL_EXPORT_C(fl_Text_Editor,    Fl_Text_Editor_New_WithLabel)(int X, int Y, int W, int H, const char* label){+    fl_Widget_Virtual_Funcs* fs = Fl_Widget_default_virtual_funcs();+    DerivedText_Editor* w = new DerivedText_Editor(X,Y,W,H,label,fs);+    return (fl_Text_Editor)w;+  }+  FL_EXPORT_C(fl_Text_Editor,    Fl_OverriddenText_Editor_New)(int X, int Y, int W, int H,fl_Widget_Virtual_Funcs* fs){+    DerivedText_Editor* w = new DerivedText_Editor(X,Y,W,H,fs);+    return (fl_Text_Editor)w;+  }+  FL_EXPORT_C(fl_Text_Editor,    Fl_OverriddenText_Editor_New_WithLabel)(int X, int Y, int W, int H, const char* label, fl_Widget_Virtual_Funcs* fs){+    DerivedText_Editor* w = new DerivedText_Editor(X,Y,W,H,label,fs);+    return (fl_Text_Editor)w;+  } #ifdef __cplusplus } #endif