1 files changed, 37 insertions, 39 deletions

diff --git a/src/c_fl_counter.cpp b/src/c_fl_counter.cpp
index c91d927..df8130e 100644
--- a/src/c_fl_counter.cpp
+++ b/src/c_fl_counter.cpp
@@ -6,62 +6,44 @@
 
 #include <FL/Fl_Counter.H>
 #include "c_fl_counter.h"
-#include "c_fl_type.h"
 
 
 
 
-class My_Counter : public Fl_Counter {
-    public:
-        using Fl_Counter::Fl_Counter;
-        friend void counter_set_draw_hook(COUNTER c, void * d);
-        friend void fl_counter_draw(COUNTER c);
-        friend void counter_set_handle_hook(COUNTER c, void * h);
-        friend int fl_counter_handle(COUNTER c, 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_Counter::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_Counter::real_draw() {
-    Fl_Counter::draw();
-}
 
-int My_Counter::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
-}
 
-int My_Counter::real_handle(int e) {
-    return Fl_Counter::handle(e);
-}
 
-void counter_set_draw_hook(COUNTER c, void * d) {
-    reinterpret_cast<My_Counter*>(c)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
+//  Attaching all relevant hooks and friends
 
-void fl_counter_draw(COUNTER c) {
-    reinterpret_cast<My_Counter*>(c)->real_draw();
-}
+class My_Counter : public Fl_Counter {
+public:
+    using Fl_Counter::Fl_Counter;
 
-void counter_set_handle_hook(COUNTER c, void * h) {
-    reinterpret_cast<My_Counter*>(c)->handle_hook = reinterpret_cast<h_hook_p>(h);
+    friend void fl_counter_draw(COUNTER c);
+    friend int fl_counter_handle(COUNTER c, int e);
+
+    void draw();
+    int handle(int e);
+};
+
+void My_Counter::draw() {
+    widget_draw_hook(this->user_data());
 }
 
-int fl_counter_handle(COUNTER c, int e) {
-    return reinterpret_cast<My_Counter*>(c)->real_handle(e);
+int My_Counter::handle(int e) {
+    return widget_handle_hook(this->user_data(), e);
 }
 
 
 
 
+//  Flattened C API
+
 COUNTER new_fl_counter(int x, int y, int w, int h, char* label) {
     My_Counter *c = new My_Counter(x, y, w, h, label);
     return c;
@@ -78,7 +60,7 @@ double fl_counter_get_step(COUNTER c) {
     return reinterpret_cast<Fl_Counter*>(c)->step();
 }
 
-void fl_counter_set_step(COUNTER c, double t) {
+void fl_counter_set_step_top(COUNTER c, double t) {
     reinterpret_cast<Fl_Counter*>(c)->step(t);
 }
 
@@ -86,6 +68,10 @@ void fl_counter_set_lstep(COUNTER c, double t) {
     reinterpret_cast<Fl_Counter*>(c)->lstep(t);
 }
 
+void fl_counter_set_step_both(COUNTER c, double s, double l) {
+    reinterpret_cast<Fl_Counter*>(c)->step(s, l);
+}
+
 
 
 
@@ -113,3 +99,15 @@ void fl_counter_set_textsize(COUNTER c, int t) {
     reinterpret_cast<Fl_Counter*>(c)->textsize(t);
 }
 
+
+
+
+void fl_counter_draw(COUNTER c) {
+    reinterpret_cast<My_Counter*>(c)->Fl_Counter::draw();
+}
+
+int fl_counter_handle(COUNTER c, int e) {
+    return reinterpret_cast<My_Counter*>(c)->Fl_Counter::handle(e);
+}
+
+