From 306adba6ddaab80c6929fe955567f25d9da7915f Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Mon, 1 May 2017 17:45:13 +1000 Subject: Draw method for Text Display and derivatives, concrete Menu_ derivatives --- src/c_fl_menu_button.cpp | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) (limited to 'src/c_fl_menu_button.cpp') diff --git a/src/c_fl_menu_button.cpp b/src/c_fl_menu_button.cpp index 864dd3e..b49d1aa 100644 --- a/src/c_fl_menu_button.cpp +++ b/src/c_fl_menu_button.cpp @@ -4,18 +4,60 @@ #include "c_fl_menu_button.h" +typedef void (hook)(void*); +typedef hook* hook_p; + + + + +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); + protected: + void draw(); + void real_draw(); + hook_p draw_hook; +}; + + +void My_Menu_Button::draw() { + (*draw_hook)(this->user_data()); +} + + +void My_Menu_Button::real_draw() { + Fl_Menu_Button::draw(); +} + + +void menu_button_set_draw_hook(MENUBUTTON m, void * d) { + reinterpret_cast(m)->draw_hook = reinterpret_cast(d); +} + + +void fl_menu_button_draw(MENUBUTTON m) { + reinterpret_cast(m)->real_draw(); +} + + + + MENUBUTTON new_fl_menu_button(int x, int y, int w, int h, char* label) { - Fl_Menu_Button *m = new Fl_Menu_Button(x, y, w, h, label); + My_Menu_Button *m = new My_Menu_Button(x, y, w, h, label); return m; } void free_fl_menu_button(MENUBUTTON m) { - delete reinterpret_cast(m); + delete reinterpret_cast(m); } + + void fl_menu_button_type(MENUBUTTON m, unsigned int t) { - reinterpret_cast(m)->type(t); + reinterpret_cast(m)->type(t); } -- cgit