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

1 files changed, 45 insertions, 37 deletions

diff --git a/src/c_fl_adjuster.cpp b/src/c_fl_adjuster.cpp
index e57bbea..1b9db8e 100644
--- a/src/c_fl_adjuster.cpp
+++ b/src/c_fl_adjuster.cpp
@@ -6,62 +6,54 @@
 
 #include <FL/Fl_Adjuster.H>
 #include "c_fl_adjuster.h"
-#include "c_fl_type.h"
 
 
 
 
-class My_Adjuster : public Fl_Adjuster {
-    public:
-        using Fl_Adjuster::Fl_Adjuster;
-        friend void adjuster_set_draw_hook(ADJUSTER a, void * d);
-        friend void fl_adjuster_draw(ADJUSTER a);
-        friend void adjuster_set_handle_hook(ADJUSTER a, void * h);
-        friend int fl_adjuster_handle(ADJUSTER a, 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;
+//  Exports from Ada
+
+extern "C" void widget_draw_hook(void * ud);
+extern "C" int widget_handle_hook(void * ud, int e);
+
+
+
+
+//  Non-friend protected access
+
+class Friend_Adjuster : Fl_Adjuster {
+public:
+    using Fl_Adjuster::value_damage;
 };
 
-void My_Adjuster::draw() {
-    (*draw_hook)(this->user_data());
-}
 
-void My_Adjuster::real_draw() {
-    Fl_Adjuster::draw();
-}
 
-int My_Adjuster::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
-}
 
-int My_Adjuster::real_handle(int e) {
-    return Fl_Adjuster::handle(e);
-}
+//  Attaching all relevant hooks and friends
 
-void adjuster_set_draw_hook(ADJUSTER a, void * d) {
-    reinterpret_cast<My_Adjuster*>(a)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
+class My_Adjuster : public Fl_Adjuster {
+public:
+    using Fl_Adjuster::Fl_Adjuster;
 
-void fl_adjuster_draw(ADJUSTER a) {
-    reinterpret_cast<My_Adjuster*>(a)->real_draw();
-}
+    friend void fl_adjuster_draw(ADJUSTER a);
+    friend int fl_adjuster_handle(ADJUSTER a, int e);
 
-void adjuster_set_handle_hook(ADJUSTER a, void * h) {
-    reinterpret_cast<My_Adjuster*>(a)->handle_hook = reinterpret_cast<h_hook_p>(h);
+    void draw();
+    int handle(int e);
+};
+
+void My_Adjuster::draw() {
+    widget_draw_hook(this->user_data());
 }
 
-int fl_adjuster_handle(ADJUSTER a, int e) {
-    return reinterpret_cast<My_Adjuster*>(a)->real_handle(e);
+int My_Adjuster::handle(int e) {
+    return widget_handle_hook(this->user_data(), e);
 }
 
 
 
 
+//  Flattened C API
+
 ADJUSTER new_fl_adjuster(int x, int y, int w, int h, char* label) {
     My_Adjuster *a = new My_Adjuster(x, y, w, h, label);
     return a;
@@ -82,3 +74,19 @@ void fl_adjuster_set_soft(ADJUSTER a, int t) {
     reinterpret_cast<Fl_Adjuster*>(a)->soft(t);
 }
 
+
+
+
+void fl_adjuster_value_damage(ADJUSTER a) {
+    (reinterpret_cast<Fl_Adjuster*>(a)->*(&Friend_Adjuster::value_damage))();
+}
+
+void fl_adjuster_draw(ADJUSTER a) {
+    reinterpret_cast<My_Adjuster*>(a)->Fl_Adjuster::draw();
+}
+
+int fl_adjuster_handle(ADJUSTER a, int e) {
+    return reinterpret_cast<My_Adjuster*>(a)->Fl_Adjuster::handle(e);
+}
+
+