Text_Editor, Text_Display, Double_Window, Single_Window, Menu_Window, Window, Group widgets all now have Handle methods

1 files changed, 35 insertions, 4 deletions

diff --git a/src/c_fl_single_window.cpp b/src/c_fl_single_window.cpp
index 71eecf5..e20bb80 100644
--- a/src/c_fl_single_window.cpp
+++ b/src/c_fl_single_window.cpp
@@ -4,8 +4,14 @@
 #include "c_fl_single_window.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_Single_Window : public Fl_Single_Window {
         using Fl_Single_Window::Fl_Single_Window;
         friend void single_window_set_draw_hook(SINGLEWINDOW n, void * d);
         friend void fl_single_window_draw(SINGLEWINDOW n);
+        friend void single_window_set_handle_hook(SINGLEWINDOW n, void * h);
+        friend int fl_single_window_handle(SINGLEWINDOW n, 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_Single_Window::real_draw() {
 }
 
 
+int My_Single_Window::handle(int e) {
+    return (*handle_hook)(this->user_data(), e);
+}
+
+
+int My_Single_Window::real_handle(int e) {
+    return Fl_Single_Window::handle(e);
+}
+
+
 void single_window_set_draw_hook(SINGLEWINDOW n, void * d) {
-    reinterpret_cast<My_Single_Window*>(n)->draw_hook = reinterpret_cast<hook_p>(d);
+    reinterpret_cast<My_Single_Window*>(n)->draw_hook = reinterpret_cast<d_hook_p>(d);
 }
 
 
@@ -42,6 +63,16 @@ void fl_single_window_draw(SINGLEWINDOW n) {
 }
 
 
+void single_window_set_handle_hook(SINGLEWINDOW n, void * h) {
+    reinterpret_cast<My_Single_Window*>(n)->handle_hook = reinterpret_cast<h_hook_p>(h);
+}
+
+
+int fl_single_window_handle(SINGLEWINDOW n, int e) {
+    return reinterpret_cast<My_Single_Window*>(n)->real_handle(e);
+}
+
+
 
 
 SINGLEWINDOW new_fl_single_window(int x, int y, int w, int h, char* label) {