diff options
author | Jed Barber <jjbarber@y7mail.com> | 2017-05-01 22:56:51 +1000 |
---|---|---|
committer | Jed Barber <jjbarber@y7mail.com> | 2017-05-01 22:56:51 +1000 |
commit | fbdef14a42388934067427854b6f5559bef31e8d (patch) | |
tree | a6d8cd4df18aaeb8b5293e60d0c0120abbcd035c /src/c_fl_menu.cpp | |
parent | 727cd771facf506910ddbb63532b3b6af7fb1b77 (diff) |
Draw method implemented for Groups, Menus, although Menus are now no longer abstract even though they should be
Diffstat (limited to 'src/c_fl_menu.cpp')
-rw-r--r-- | src/c_fl_menu.cpp | 59 |
1 files changed, 56 insertions, 3 deletions
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(); } |