From f37664163c9dfa33416845ddd78695c33e6fdaef Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Sat, 29 Apr 2017 23:45:04 +1000
Subject: Can now override Draw method from Ada side for Window widgets

---
 src/c_fl_window.cpp | 64 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 10 deletions(-)

(limited to 'src/c_fl_window.cpp')

diff --git a/src/c_fl_window.cpp b/src/c_fl_window.cpp
index fbce39b..eda235a 100644
--- a/src/c_fl_window.cpp
+++ b/src/c_fl_window.cpp
@@ -5,54 +5,98 @@
 #include "c_fl_window.h"
 
 
+
+
+typedef void (hook)(void*);
+typedef hook* hook_p;
+
+
+
+
+class My_Window : public Fl_Window {
+    public:
+        using Fl_Window::Fl_Window;
+        friend void window_set_draw_hook(WINDOW n, void * d);
+        friend void fl_window_draw(WINDOW n);
+    protected:
+        void draw();
+        void real_draw();
+        hook_p draw_hook;
+};
+
+
+void My_Window::draw() {
+    (*draw_hook)(this->user_data());
+}
+
+
+void My_Window::real_draw() {
+    Fl_Window::draw();
+}
+
+
+void window_set_draw_hook(WINDOW n, void * d) {
+    reinterpret_cast<My_Window*>(n)->draw_hook = reinterpret_cast<hook_p>(d);
+}
+
+
+void fl_window_draw(WINDOW n) {
+    reinterpret_cast<My_Window*>(n)->real_draw();
+}
+
+
+
+
 WINDOW new_fl_window(int x, int y, int w, int h, char* label) {
-    Fl_Window *n = new Fl_Window(x, y, w, h, label);
+    My_Window *n = new My_Window(x, y, w, h, label);
     return n;
 }
 
 
 WINDOW new_fl_window2(int w, int h) {
-    Fl_Window *n = new Fl_Window(w, h);
+    My_Window *n = new My_Window(w, h);
     return n;
 }
 
 
 void free_fl_window(WINDOW n) {
-    delete reinterpret_cast<Fl_Window*>(n);
+    delete reinterpret_cast<My_Window*>(n);
 }
 
 
+
+
 void fl_window_show(WINDOW n) {
-    reinterpret_cast<Fl_Window*>(n)->show();
+    reinterpret_cast<My_Window*>(n)->show();
 }
 
 
 void fl_window_hide(WINDOW n) {
-    reinterpret_cast<Fl_Window*>(n)->hide();
+    reinterpret_cast<My_Window*>(n)->hide();
 }
 
 
 void fl_window_set_label(WINDOW n, char* text) {
-    reinterpret_cast<Fl_Window*>(n)->copy_label(text);
+    reinterpret_cast<My_Window*>(n)->copy_label(text);
 }
 
 
 void fl_window_size_range(WINDOW n, int lw, int lh, int hw, int hh, int dw, int dh, int a) {
-    reinterpret_cast<Fl_Window*>(n)->size_range(lw, lh, hw, hh, dw, dh, a);
+    reinterpret_cast<My_Window*>(n)->size_range(lw, lh, hw, hh, dw, dh, a);
 }
 
 
 void fl_window_set_icon(WINDOW n, void * img) {
-    reinterpret_cast<Fl_Window*>(n)->icon(reinterpret_cast<Fl_RGB_Image*>(img));
+    reinterpret_cast<My_Window*>(n)->icon(reinterpret_cast<Fl_RGB_Image*>(img));
 }
 
 
 void fl_window_set_modal(WINDOW n) {
-    reinterpret_cast<Fl_Window*>(n)->set_modal();
+    reinterpret_cast<My_Window*>(n)->set_modal();
 }
 
 
 void fl_window_set_non_modal(WINDOW n) {
-    reinterpret_cast<Fl_Window*>(n)->set_non_modal();
+    reinterpret_cast<My_Window*>(n)->set_non_modal();
 }
 
-- 
cgit