From fbdef14a42388934067427854b6f5559bef31e8d Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Mon, 1 May 2017 22:56:51 +1000
Subject: Draw method implemented for Groups, Menus, although Menus are now no
 longer abstract even though they should be

---
 src/c_fl_menu.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

(limited to 'src/c_fl_menu.cpp')

diff --git a/src/c_fl_menu.cpp b/src/c_fl_menu.cpp
index f8c7b9e..630e63f 100644
--- a/src/c_fl_menu.cpp
+++ b/src/c_fl_menu.cpp
@@ -5,18 +5,71 @@
 #include "c_fl_menu.h"
 
 
+typedef void (hook)(void*);
+typedef hook* hook_p;
+
+
+
+
+class My_Menu : public Fl_Menu_ {
+    public:
+        using Fl_Menu_::Fl_Menu_;
+        friend void menu_set_draw_hook(MENU m, void * d);
+        friend void fl_menu_draw(MENU m);
+    protected:
+        void draw();
+        void real_draw();
+        hook_p draw_hook;
+};
+
+
+void My_Menu::draw() {
+    (*draw_hook)(this->user_data());
+}
+
+
+void My_Menu::real_draw() {
+    Fl_Menu_::draw();
+}
+
+
+void menu_set_draw_hook(MENU m, void * d) {
+    reinterpret_cast<My_Menu*>(m)->draw_hook = reinterpret_cast<hook_p>(d);
+}
+
+
+void fl_menu_draw(MENU m) {
+    reinterpret_cast<My_Menu*>(m)->real_draw();
+}
+
+
+
+
+MENU new_fl_menu(int x, int y, int w, int h, char* label) {
+    My_Menu *m = new My_Menu(x, y, w, h, label);
+    return m;
+}
+
+
+void free_fl_menu(MENU m) {
+    delete reinterpret_cast<My_Menu*>(m);
+}
+
+
+
+
 int fl_menu_add(MENU m, const char * t, unsigned long s, void * c, void * u, unsigned long f) {
-    return reinterpret_cast<Fl_Menu_*>(m)->add(t, s, reinterpret_cast<Fl_Callback_p>(c), u, f);
+    return reinterpret_cast<My_Menu*>(m)->add(t, s, reinterpret_cast<Fl_Callback_p>(c), u, f);
 }
 
 
 const void * fl_menu_find_item(MENU m, const char * t) {
-    return reinterpret_cast<Fl_Menu_*>(m)->find_item(t);
+    return reinterpret_cast<My_Menu*>(m)->find_item(t);
 }
 
 
 const void * fl_menu_mvalue(MENU m) {
-    return reinterpret_cast<Fl_Menu_*>(m)->mvalue();
+    return reinterpret_cast<My_Menu*>(m)->mvalue();
 }
 
 
-- 
cgit