From f4b68da1d14d39ab4140d8c5e7fbbf45525e7e77 Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Sat, 13 May 2017 23:05:47 +1000
Subject: Text_Editor, Text_Display, Double_Window, Single_Window, Menu_Window,
 Window, Group widgets all now have Handle methods

---
 src/c_fl_window.cpp | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'src/c_fl_window.cpp')

diff --git a/src/c_fl_window.cpp b/src/c_fl_window.cpp
index 1413646..e6f0adb 100644
--- a/src/c_fl_window.cpp
+++ b/src/c_fl_window.cpp
@@ -7,8 +7,12 @@
 
 
 
-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;
 
 
 
@@ -18,10 +22,15 @@ class My_Window : public Fl_Window {
         using Fl_Window::Fl_Window;
         friend void window_set_draw_hook(WINDOW n, void * d);
         friend void fl_window_draw(WINDOW n);
+        friend void window_set_handle_hook(WINDOW n, void * h);
+        friend int fl_window_handle(WINDOW 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;
 };
 
 
@@ -35,8 +44,18 @@ void My_Window::real_draw() {
 }
 
 
+int My_Window::handle(int e) {
+    return (*handle_hook)(this->user_data(), e);
+}
+
+
+int My_Window::real_handle(int e) {
+    return Fl_Window::handle(e);
+}
+
+
 void window_set_draw_hook(WINDOW n, void * d) {
-    reinterpret_cast<My_Window*>(n)->draw_hook = reinterpret_cast<hook_p>(d);
+    reinterpret_cast<My_Window*>(n)->draw_hook = reinterpret_cast<d_hook_p>(d);
 }
 
 
@@ -45,6 +64,16 @@ void fl_window_draw(WINDOW n) {
 }
 
 
+void window_set_handle_hook(WINDOW n, void * h) {
+    reinterpret_cast<My_Window*>(n)->handle_hook = reinterpret_cast<h_hook_p>(h);
+}
+
+
+int fl_window_handle(WINDOW n, int e) {
+    return reinterpret_cast<My_Window*>(n)->real_handle(e);
+}
+
+
 
 
 WINDOW new_fl_window(int x, int y, int w, int h, char* label) {
-- 
cgit