diff options
author | Jed Barber <jjbarber@y7mail.com> | 2017-05-13 16:18:00 +1000 |
---|---|---|
committer | Jed Barber <jjbarber@y7mail.com> | 2017-05-13 16:18:00 +1000 |
commit | e35f258838e3a5e5d3458e9d9210deaaace08e9d (patch) | |
tree | 3529f0657ce5c9e4857100a40c5244f8eaf16eda /src/c_fl_return_button.cpp | |
parent | 1c0ddbf9eeb33f6bedc1fb9156e124b3a7b17bbc (diff) |
Enter_Button, Check_Button, Radio_Light_Button, Light_Button widgets now have Handle methods
Diffstat (limited to 'src/c_fl_return_button.cpp')
-rw-r--r-- | src/c_fl_return_button.cpp | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/src/c_fl_return_button.cpp b/src/c_fl_return_button.cpp index 77939a7..11a7a9b 100644 --- a/src/c_fl_return_button.cpp +++ b/src/c_fl_return_button.cpp @@ -4,8 +4,14 @@ #include "c_fl_return_button.h" -typedef void (hook)(void*); -typedef hook* hook_p; + + +typedef void (d_hook)(void*); +typedef d_hook* d_hook_p; + + +typedef int (h_hook)(void*,int); +typedef h_hook* h_hook_p; @@ -15,10 +21,15 @@ class My_Return_Button : public Fl_Return_Button { using Fl_Return_Button::Fl_Return_Button; friend void return_button_set_draw_hook(RETURNBUTTON b, void * d); friend void fl_return_button_draw(RETURNBUTTON b); + friend void return_button_set_handle_hook(RETURNBUTTON b, void * h); + friend int fl_return_button_handle(RETURNBUTTON b, int e); protected: void draw(); void real_draw(); - hook_p draw_hook; + int handle(int e); + int real_handle(int e); + d_hook_p draw_hook; + h_hook_p handle_hook; }; @@ -32,8 +43,18 @@ void My_Return_Button::real_draw() { } +int My_Return_Button::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + + +int My_Return_Button::real_handle(int e) { + return Fl_Return_Button::handle(e); +} + + void return_button_set_draw_hook(RETURNBUTTON b, void * d) { - reinterpret_cast<My_Return_Button*>(b)->draw_hook = reinterpret_cast<hook_p>(d); + reinterpret_cast<My_Return_Button*>(b)->draw_hook = reinterpret_cast<d_hook_p>(d); } @@ -42,6 +63,16 @@ void fl_return_button_draw(RETURNBUTTON b) { } +void return_button_set_handle_hook(RETURNBUTTON b, void * h) { + reinterpret_cast<My_Return_Button*>(b)->handle_hook = reinterpret_cast<h_hook_p>(h); +} + + +int fl_return_button_handle(RETURNBUTTON b, int e) { + return reinterpret_cast<My_Return_Button*>(b)->real_handle(e); +} + + RETURNBUTTON new_fl_return_button(int x, int y, int w, int h, char* label) { |