1 files changed, 31 insertions, 38 deletions

diff --git a/src/c_fl_menu_button.cpp b/src/c_fl_menu_button.cpp
index fd78df4..4a32ca6 100644
--- a/src/c_fl_menu_button.cpp
+++ b/src/c_fl_menu_button.cpp
@@ -6,7 +6,6 @@
 
 #include <FL/Fl_Menu_Button.H>
 #include "c_fl_menu_button.h"
-#include "c_fl_type.h"
 
 
 
@@ -27,57 +26,40 @@ void fl_menu_button_extra_final(void * adaobj) {
 
 
 
-class My_Menu_Button : public Fl_Menu_Button {
-    public:
-        using Fl_Menu_Button::Fl_Menu_Button;
-        friend void menu_button_set_draw_hook(MENUBUTTON m, void * d);
-        friend void fl_menu_button_draw(MENUBUTTON m);
-        friend void menu_button_set_handle_hook(MENUBUTTON m, void * h);
-        friend int fl_menu_button_handle(MENUBUTTON m, 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_Menu_Button::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_Menu_Button::real_draw() {
-    Fl_Menu_Button::draw();
-}
 
-int My_Menu_Button::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
-}
 
-int My_Menu_Button::real_handle(int e) {
-    return Fl_Menu_Button::handle(e);
-}
 
-void menu_button_set_draw_hook(MENUBUTTON m, void * d) {
-    reinterpret_cast<My_Menu_Button*>(m)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
+//  Attaching all relevant hooks and friends
 
-void fl_menu_button_draw(MENUBUTTON m) {
-    reinterpret_cast<My_Menu_Button*>(m)->real_draw();
-}
+class My_Menu_Button : public Fl_Menu_Button {
+public:
+    using Fl_Menu_Button::Fl_Menu_Button;
+
+    friend void fl_menu_button_draw(MENUBUTTON m);
+    friend int fl_menu_button_handle(MENUBUTTON m, int e);
+
+    void draw();
+    int handle(int e);
+};
 
-void menu_button_set_handle_hook(MENUBUTTON m, void * h) {
-    reinterpret_cast<My_Menu_Button*>(m)->handle_hook = reinterpret_cast<h_hook_p>(h);
+void My_Menu_Button::draw() {
+    widget_draw_hook(this->user_data());
 }
 
-int fl_menu_button_handle(MENUBUTTON m, int e) {
-    return reinterpret_cast<My_Menu_Button*>(m)->real_handle(e);
+int My_Menu_Button::handle(int e) {
+    return widget_handle_hook(this->user_data(), e);
 }
 
 
 
 
+//  Flattened C API
+
 MENUBUTTON new_fl_menu_button(int x, int y, int w, int h, char* label) {
     My_Menu_Button *m = new My_Menu_Button(x, y, w, h, label);
     return m;
@@ -99,3 +81,14 @@ const void * fl_menu_button_popup(MENUBUTTON m) {
 }
 
 
+
+
+void fl_menu_button_draw(MENUBUTTON m) {
+    reinterpret_cast<My_Menu_Button*>(m)->Fl_Menu_Button::draw();
+}
+
+int fl_menu_button_handle(MENUBUTTON m, int e) {
+    return reinterpret_cast<My_Menu_Button*>(m)->Fl_Menu_Button::handle(e);
+}
+
+