Refactored draw/handle methods in Widgets hierarchy, improved docs, added a few minor method bindings here and there

1 files changed, 31 insertions, 38 deletions

diff --git a/src/c_fl_fill_slider.cpp b/src/c_fl_fill_slider.cpp
index d4177e1..d443684 100644
--- a/src/c_fl_fill_slider.cpp
+++ b/src/c_fl_fill_slider.cpp
@@ -6,69 +6,62 @@
 
 #include <FL/Fl_Fill_Slider.H>
 #include "c_fl_fill_slider.h"
-#include "c_fl_type.h"
 
 
 
 
+//  Exports from Ada
+
+extern "C" void widget_draw_hook(void * ud);
+extern "C" int widget_handle_hook(void * ud, int e);
+
+
+
+
+//  Attaching all relevant hooks and friends
+
 class My_Fill_Slider : public Fl_Fill_Slider {
-    public:
-        using Fl_Fill_Slider::Fl_Fill_Slider;
-        friend void fill_slider_set_draw_hook(FILL_SLIDER s, void * d);
-        friend void fl_fill_slider_draw(FILL_SLIDER s);
-        friend void fill_slider_set_handle_hook(FILL_SLIDER s, void * h);
-        friend int fl_fill_slider_handle(FILL_SLIDER s, int e);
-    protected:
-        void draw();
-        void real_draw();
-        int handle(int e);
-        int real_handle(int e);
-        d_hook_p draw_hook;
-        h_hook_p handle_hook;
+public:
+    using Fl_Fill_Slider::Fl_Fill_Slider;
+
+    friend void fl_fill_slider_draw(FILLSLIDER s);
+    friend int fl_fill_slider_handle(FILLSLIDER s, int e);
+
+    void draw();
+    int handle(int e);
 };
 
 void My_Fill_Slider::draw() {
-    (*draw_hook)(this->user_data());
-}
-
-void My_Fill_Slider::real_draw() {
-    Fl_Fill_Slider::draw();
+    widget_draw_hook(this->user_data());
 }
 
 int My_Fill_Slider::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
+    return widget_handle_hook(this->user_data(), e);
 }
 
-int My_Fill_Slider::real_handle(int e) {
-    return Fl_Fill_Slider::handle(e);
-}
 
-void fill_slider_set_draw_hook(FILL_SLIDER s, void * d) {
-    reinterpret_cast<My_Fill_Slider*>(s)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
 
-void fl_fill_slider_draw(FILL_SLIDER s) {
-    reinterpret_cast<My_Fill_Slider*>(s)->real_draw();
-}
 
-void fill_slider_set_handle_hook(FILL_SLIDER s, void * h) {
-    reinterpret_cast<My_Fill_Slider*>(s)->handle_hook = reinterpret_cast<h_hook_p>(h);
+//  Flattened C API
+
+FILLSLIDER new_fl_fill_slider(int x, int y, int w, int h, char* label) {
+    My_Fill_Slider *s = new My_Fill_Slider(x, y, w, h, label);
+    return s;
 }
 
-int fl_fill_slider_handle(FILL_SLIDER s, int e) {
-    return reinterpret_cast<My_Fill_Slider*>(s)->real_handle(e);
+void free_fl_fill_slider(FILLSLIDER s) {
+    delete reinterpret_cast<My_Fill_Slider*>(s);
 }
 
 
 
 
-FILL_SLIDER new_fl_fill_slider(int x, int y, int w, int h, char* label) {
-    My_Fill_Slider *s = new My_Fill_Slider(x, y, w, h, label);
-    return s;
+void fl_fill_slider_draw(FILLSLIDER s) {
+    reinterpret_cast<My_Fill_Slider*>(s)->Fl_Fill_Slider::draw();
 }
 
-void free_fl_fill_slider(FILL_SLIDER s) {
-    delete reinterpret_cast<My_Fill_Slider*>(s);
+int fl_fill_slider_handle(FILLSLIDER s, int e) {
+    return reinterpret_cast<My_Fill_Slider*>(s)->Fl_Fill_Slider::handle(e);
 }