1 files changed, 57 insertions, 52 deletions

diff --git a/src/c_fl_dial.cpp b/src/c_fl_dial.cpp
index a2f0bdc..8e32820 100644
--- a/src/c_fl_dial.cpp
+++ b/src/c_fl_dial.cpp
@@ -6,62 +6,56 @@
 
 #include <FL/Fl_Dial.H>
 #include "c_fl_dial.h"
-#include "c_fl_type.h"
 
 
 
 
-class My_Dial : public Fl_Dial {
-    public:
-        using Fl_Dial::Fl_Dial;
-        friend void dial_set_draw_hook(DIAL v, void * d);
-        friend void fl_dial_draw(DIAL v);
-        friend void dial_set_handle_hook(DIAL v, void * h);
-        friend int fl_dial_handle(DIAL v, 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_Dial : Fl_Dial {
+public:
+    //  Really only needed for the (int,int,int,int) versions
+    using Fl_Dial::draw;
+    using Fl_Dial::handle;
 };
 
-void My_Dial::draw() {
-    (*draw_hook)(this->user_data());
-}
 
-void My_Dial::real_draw() {
-    Fl_Dial::draw();
-}
 
-int My_Dial::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
-}
 
-int My_Dial::real_handle(int e) {
-    return Fl_Dial::handle(e);
-}
+//  Attaching all relevant hooks and friends
 
-void dial_set_draw_hook(DIAL v, void * d) {
-    reinterpret_cast<My_Dial*>(v)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
+class My_Dial : public Fl_Dial {
+public:
+    using Fl_Dial::Fl_Dial;
 
-void fl_dial_draw(DIAL v) {
-    reinterpret_cast<My_Dial*>(v)->real_draw();
-}
+    friend void fl_dial_draw(DIAL v);
+    friend int fl_dial_handle(DIAL v, int e);
+
+    void draw();
+    int handle(int e);
+};
 
-void dial_set_handle_hook(DIAL v, void * h) {
-    reinterpret_cast<My_Dial*>(v)->handle_hook = reinterpret_cast<h_hook_p>(h);
+void My_Dial::draw() {
+    widget_draw_hook(this->user_data());
 }
 
-int fl_dial_handle(DIAL v, int e) {
-    return reinterpret_cast<My_Dial*>(v)->real_handle(e);
+int My_Dial::handle(int e) {
+    return widget_handle_hook(this->user_data(), e);
 }
 
 
 
 
+//  Flattened C API
+
 DIAL new_fl_dial(int x, int y, int w, int h, char* label) {
     My_Dial *v = new My_Dial(x, y, w, h, label);
     return v;
@@ -74,34 +68,45 @@ void free_fl_dial(DIAL v) {
 
 
 
-int fl_dial_get_type(DIAL v) {
-    return reinterpret_cast<Fl_Dial*>(v)->type();
+short fl_dial_get_angle1(DIAL v) {
+    return reinterpret_cast<Fl_Dial*>(v)->angle1();
 }
 
-void fl_dial_set_type(DIAL v, int t) {
-    reinterpret_cast<Fl_Dial*>(v)->type(t);
+void fl_dial_set_angle1(DIAL v, short t) {
+    reinterpret_cast<Fl_Dial*>(v)->angle1(t);
 }
 
+short fl_dial_get_angle2(DIAL v) {
+    return reinterpret_cast<Fl_Dial*>(v)->angle2();
+}
 
+void fl_dial_set_angle2(DIAL v, short t) {
+    reinterpret_cast<Fl_Dial*>(v)->angle2(t);
+}
 
-
-int fl_dial_get_angle1(DIAL v) {
-    return reinterpret_cast<Fl_Dial*>(v)->angle1();
+void fl_dial_set_angles(DIAL v, short a, short b) {
+    reinterpret_cast<Fl_Dial*>(v)->angles(a,b);
 }
 
-void fl_dial_set_angle1(DIAL v, int t) {
-    reinterpret_cast<Fl_Dial*>(v)->angle1(t);
+
+
+
+void fl_dial_draw(DIAL v) {
+    reinterpret_cast<My_Dial*>(v)->Fl_Dial::draw();
 }
 
-int fl_dial_get_angle2(DIAL v) {
-    return reinterpret_cast<Fl_Dial*>(v)->angle2();
+void fl_dial_draw2(DIAL v, int x, int y, int w, int h) {
+    void (Fl_Dial::*mydraw)(int,int,int,int) = &Friend_Dial::draw;
+    (reinterpret_cast<Fl_Dial*>(v)->*mydraw)(x, y, w, h);
 }
 
-void fl_dial_set_angle2(DIAL v, int t) {
-    reinterpret_cast<Fl_Dial*>(v)->angle2(t);
+int fl_dial_handle(DIAL v, int e) {
+    return reinterpret_cast<My_Dial*>(v)->Fl_Dial::handle(e);
 }
 
-void fl_dial_set_angles(DIAL v, int a, int b) {
-    reinterpret_cast<Fl_Dial*>(v)->angles(a,b);
+int fl_dial_handle2(DIAL v, int e, int x, int y, int w, int h) {
+    int (Fl_Dial::*myhandle)(int,int,int,int,int) = &Friend_Dial::handle;
+    return (reinterpret_cast<Fl_Dial*>(v)->*myhandle)(e, x, y, w, h);
 }
 
+