1 files changed, 39 insertions, 38 deletions

diff --git a/src/c_fl_spinner.cpp b/src/c_fl_spinner.cpp
index 1556ddc..a09ed17 100644
--- a/src/c_fl_spinner.cpp
+++ b/src/c_fl_spinner.cpp
@@ -6,62 +6,44 @@
 
 #include <FL/Fl_Spinner.H>
 #include "c_fl_spinner.h"
-#include "c_fl_type.h"
 
 
 
 
-class My_Spinner : public Fl_Spinner {
-    public:
-        using Fl_Spinner::Fl_Spinner;
-        friend void spinner_set_draw_hook(SPINNER n, void * d);
-        friend void fl_spinner_draw(SPINNER n);
-        friend void spinner_set_handle_hook(SPINNER n, void * h);
-        friend int fl_spinner_handle(SPINNER n, 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
 
-void My_Spinner::draw() {
-    (*draw_hook)(this->user_data());
-}
+extern "C" void widget_draw_hook(void * ud);
+extern "C" int widget_handle_hook(void * ud, int e);
 
-void My_Spinner::real_draw() {
-    Fl_Spinner::draw();
-}
 
-int My_Spinner::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
-}
 
-int My_Spinner::real_handle(int e) {
-    return Fl_Spinner::handle(e);
-}
 
-void spinner_set_draw_hook(SPINNER n, void * d) {
-    reinterpret_cast<My_Spinner*>(n)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
+//  Attaching all hooks and friends
 
-void fl_spinner_draw(SPINNER n) {
-    reinterpret_cast<My_Spinner*>(n)->real_draw();
-}
+class My_Spinner : public Fl_Spinner {
+public:
+    using Fl_Spinner::Fl_Spinner;
+
+    friend void fl_spinner_draw(SPINNER n);
+    friend int fl_spinner_handle(SPINNER n, int e);
 
-void spinner_set_handle_hook(SPINNER n, void * h) {
-    reinterpret_cast<My_Spinner*>(n)->handle_hook = reinterpret_cast<h_hook_p>(h);
+    void draw();
+    int handle(int e);
+};
+
+void My_Spinner::draw() {
+    widget_draw_hook(this->user_data());
 }
 
-int fl_spinner_handle(SPINNER n, int e) {
-    return reinterpret_cast<My_Spinner*>(n)->real_handle(e);
+int My_Spinner::handle(int e) {
+    return widget_handle_hook(this->user_data(), e);
 }
 
 
 
 
+//  Flattened C API
+
 SPINNER new_fl_spinner(int x, int y, int w, int h, char* label) {
     My_Spinner *n = new My_Spinner(x, y, w, h, label);
     return n;
@@ -161,3 +143,22 @@ void fl_spinner_set_value(SPINNER n, double t) {
     reinterpret_cast<Fl_Spinner*>(n)->value(t);
 }
 
+
+
+
+void fl_spinner_resize(SPINNER n, int x, int y, int w, int h) {
+    reinterpret_cast<Fl_Spinner*>(n)->resize(x, y, w, h);
+}
+
+
+
+
+void fl_spinner_draw(SPINNER n) {
+    reinterpret_cast<My_Spinner*>(n)->Fl_Spinner::draw();
+}
+
+int fl_spinner_handle(SPINNER n, int e) {
+    return reinterpret_cast<My_Spinner*>(n)->Fl_Spinner::handle(e);
+}
+
+