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

1 files changed, 40 insertions, 9 deletions

diff --git a/src/c_fl_multiline_input.cpp b/src/c_fl_multiline_input.cpp
index c9bdfaa..3d6cb09 100644
--- a/src/c_fl_multiline_input.cpp
+++ b/src/c_fl_multiline_input.cpp
@@ -4,8 +4,14 @@
 #include "c_fl_multiline_input.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;
 
 
 
@@ -13,12 +19,17 @@ typedef hook* hook_p;
 class My_Multiline_Input : public Fl_Multiline_Input {
     public:
         using Fl_Multiline_Input::Fl_Multiline_Input;
-        friend void multiline_input_set_draw_hook(MULTILINE_INPUT n, void * d);
-        friend void fl_multiline_input_draw(MULTILINE_INPUT n);
+        friend void multiline_input_set_draw_hook(MULTILINE_INPUT i, void * d);
+        friend void fl_multiline_input_draw(MULTILINE_INPUT i);
+        friend void multiline_input_set_handle_hook(MULTILINE_INPUT i, void * h);
+        friend int fl_multiline_input_handle(MULTILINE_INPUT i, 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,13 +43,33 @@ void My_Multiline_Input::real_draw() {
 }
 
 
-void multiline_input_set_draw_hook(MULTILINE_INPUT n, void * d) {
-    reinterpret_cast<My_Multiline_Input*>(n)->draw_hook = reinterpret_cast<hook_p>(d);
+int My_Multiline_Input::handle(int e) {
+    return (*handle_hook)(this->user_data(), e);
+}
+
+
+int My_Multiline_Input::real_handle(int e) {
+    return Fl_Multiline_Input::handle(e);
+}
+
+
+void multiline_input_set_draw_hook(MULTILINE_INPUT i, void * d) {
+    reinterpret_cast<My_Multiline_Input*>(i)->draw_hook = reinterpret_cast<d_hook_p>(d);
+}
+
+
+void fl_multiline_input_draw(MULTILINE_INPUT i) {
+    reinterpret_cast<My_Multiline_Input*>(i)->real_draw();
+}
+
+
+void multiline_input_set_handle_hook(MULTILINE_INPUT i, void * h) {
+    reinterpret_cast<My_Multiline_Input*>(i)->handle_hook = reinterpret_cast<h_hook_p>(h);
 }
 
 
-void fl_multiline_input_draw(MULTILINE_INPUT n) {
-    reinterpret_cast<My_Multiline_Input*>(n)->real_draw();
+int fl_multiline_input_handle(MULTILINE_INPUT i, int e) {
+    return reinterpret_cast<My_Multiline_Input*>(i)->real_handle(e);
 }