From 371cccdf78fa9aaf49158ea57e598abcd5ff56f0 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Sun, 14 May 2017 11:13:43 +1000 Subject: File_Input, Float_Input, Integer_Input, Multiline_Input, Output, Multiline_Output, Secret_Input, Input, Menu, Menu_Bar, Menu_Button widgets all now have a Handle method --- src/c_fl_menu.cpp | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'src/c_fl_menu.cpp') diff --git a/src/c_fl_menu.cpp b/src/c_fl_menu.cpp index daff92b..8a8b974 100644 --- a/src/c_fl_menu.cpp +++ b/src/c_fl_menu.cpp @@ -5,8 +5,14 @@ #include "c_fl_menu.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,9 +21,12 @@ class My_Menu : public Fl_Menu_ { public: using Fl_Menu_::Fl_Menu_; friend void menu_set_draw_hook(MENU m, void * d); + friend void menu_set_handle_hook(MENU m, void * h); protected: void draw(); - hook_p draw_hook; + int handle(int e); + d_hook_p draw_hook; + h_hook_p handle_hook; }; @@ -26,8 +35,18 @@ void My_Menu::draw() { } +int My_Menu::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + + void menu_set_draw_hook(MENU m, void * d) { - reinterpret_cast(m)->draw_hook = reinterpret_cast(d); + reinterpret_cast(m)->draw_hook = reinterpret_cast(d); +} + + +void menu_set_handle_hook(MENU m, void * h) { + reinterpret_cast(m)->handle_hook = reinterpret_cast(h); } -- cgit