diff options
Diffstat (limited to 'src/c_fl_menu_bar.cpp')
-rw-r--r-- | src/c_fl_menu_bar.cpp | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/src/c_fl_menu_bar.cpp b/src/c_fl_menu_bar.cpp index 3246a97..947a6ce 100644 --- a/src/c_fl_menu_bar.cpp +++ b/src/c_fl_menu_bar.cpp @@ -4,8 +4,14 @@ #include "c_fl_menu_bar.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_Menu_Bar : public Fl_Menu_Bar { using Fl_Menu_Bar::Fl_Menu_Bar; friend void menu_bar_set_draw_hook(MENUBAR m, void * d); friend void fl_menu_bar_draw(MENUBAR m); + friend void menu_bar_set_handle_hook(MENUBAR m, void * h); + friend int fl_menu_bar_handle(MENUBAR m, 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_Menu_Bar::real_draw() { } +int My_Menu_Bar::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + + +int My_Menu_Bar::real_handle(int e) { + return Fl_Menu_Bar::handle(e); +} + + void menu_bar_set_draw_hook(MENUBAR m, void * d) { - reinterpret_cast<My_Menu_Bar*>(m)->draw_hook = reinterpret_cast<hook_p>(d); + reinterpret_cast<My_Menu_Bar*>(m)->draw_hook = reinterpret_cast<d_hook_p>(d); } @@ -42,6 +63,16 @@ void fl_menu_bar_draw(MENUBAR m) { } +void menu_bar_set_handle_hook(MENUBAR m, void * h) { + reinterpret_cast<My_Menu_Bar*>(m)->handle_hook = reinterpret_cast<h_hook_p>(h); +} + + +int fl_menu_bar_handle(MENUBAR m, int e) { + return reinterpret_cast<My_Menu_Bar*>(m)->real_handle(e); +} + + MENUBAR new_fl_menu_bar(int x, int y, int w, int h, char* label) { |