From 727cd771facf506910ddbb63532b3b6af7fb1b77 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Mon, 1 May 2017 20:53:10 +1000 Subject: Draw method implemented for all Button variations (ugh) --- src/c_fl_toggle_button.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) (limited to 'src/c_fl_toggle_button.cpp') diff --git a/src/c_fl_toggle_button.cpp b/src/c_fl_toggle_button.cpp index d52e72e..d1dd0c0 100644 --- a/src/c_fl_toggle_button.cpp +++ b/src/c_fl_toggle_button.cpp @@ -4,13 +4,53 @@ #include "c_fl_toggle_button.h" +typedef void (hook)(void*); +typedef hook* hook_p; + + + + +class My_Toggle_Button : public Fl_Toggle_Button { + public: + using Fl_Toggle_Button::Fl_Toggle_Button; + friend void toggle_button_set_draw_hook(TOGGLEBUTTON b, void * d); + friend void fl_toggle_button_draw(TOGGLEBUTTON b); + protected: + void draw(); + void real_draw(); + hook_p draw_hook; +}; + + +void My_Toggle_Button::draw() { + (*draw_hook)(this->user_data()); +} + + +void My_Toggle_Button::real_draw() { + Fl_Toggle_Button::draw(); +} + + +void toggle_button_set_draw_hook(TOGGLEBUTTON b, void * d) { + reinterpret_cast(b)->draw_hook = reinterpret_cast(d); +} + + +void fl_toggle_button_draw(TOGGLEBUTTON b) { + reinterpret_cast(b)->real_draw(); +} + + + + TOGGLEBUTTON new_fl_toggle_button(int x, int y, int w, int h, char* label) { - Fl_Toggle_Button *b = new Fl_Toggle_Button(x, y, w, h, label); + My_Toggle_Button *b = new My_Toggle_Button(x, y, w, h, label); return b; } void free_fl_toggle_button(TOGGLEBUTTON b) { - delete reinterpret_cast(b); + delete reinterpret_cast(b); } -- cgit