Refactored draw/handle methods in Widgets hierarchy, improved docs, added a few minor method bindings here and there

1 files changed, 26 insertions, 19 deletions

diff --git a/src/fltk-widgets-groups-windows.adb b/src/fltk-widgets-groups-windows.adb
index 0c02f6c..090def8 100644
--- a/src/fltk-widgets-groups-windows.adb
+++ b/src/fltk-widgets-groups-windows.adb
@@ -19,18 +19,9 @@ use type
 package body FLTK.Widgets.Groups.Windows is
 
 
-    procedure window_set_draw_hook
-           (W, D : in Storage.Integer_Address);
-    pragma Import (C, window_set_draw_hook, "window_set_draw_hook");
-    pragma Inline (window_set_draw_hook);
-
-    procedure window_set_handle_hook
-           (W, H : in Storage.Integer_Address);
-    pragma Import (C, window_set_handle_hook, "window_set_handle_hook");
-    pragma Inline (window_set_handle_hook);
-
-
-
+    ------------------------
+    --  Functions From C  --
+    ------------------------
 
     function new_fl_window
            (X, Y, W, H : in Interfaces.C.int;
@@ -300,6 +291,10 @@ package body FLTK.Widgets.Groups.Windows is
 
 
 
+    -------------------
+    --  Destructors  --
+    -------------------
+
     procedure Extra_Final
            (This : in out Window) is
     begin
@@ -320,6 +315,10 @@ package body FLTK.Widgets.Groups.Windows is
 
 
 
+    --------------------
+    --  Constructors  --
+    --------------------
+
     procedure Extra_Init
            (This       : in out Window;
             X, Y, W, H : in     Integer;
@@ -329,6 +328,14 @@ package body FLTK.Widgets.Groups.Windows is
     end Extra_Init;
 
 
+    procedure Initialize
+           (This : in out Window) is
+    begin
+        This.Draw_Ptr   := fl_window_draw'Address;
+        This.Handle_Ptr := fl_window_handle'Address;
+    end Initialize;
+
+
     package body Forge is
 
         function Create
@@ -344,8 +351,6 @@ package body FLTK.Widgets.Groups.Windows is
                         Interfaces.C.int (H),
                         Interfaces.C.To_C (Text));
                 Extra_Init (This, X, Y, W, H, Text);
-                window_set_draw_hook (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
-                window_set_handle_hook (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address));
             end return;
         end Create;
 
@@ -361,8 +366,6 @@ package body FLTK.Widgets.Groups.Windows is
                         Interfaces.C.int (H),
                         Interfaces.C.To_C (Text));
                 Extra_Init (This, This.Get_X, This.Get_Y, W, H, Text);
-                window_set_draw_hook (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
-                window_set_handle_hook (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address));
             end return;
         end Create;
 
@@ -371,6 +374,10 @@ package body FLTK.Widgets.Groups.Windows is
 
 
 
+    -----------------------
+    --  API Subprograms  --
+    -----------------------
+
     procedure Show
            (This : in out Window) is
     begin
@@ -727,7 +734,7 @@ package body FLTK.Widgets.Groups.Windows is
     procedure Draw
            (This : in out Window) is
     begin
-        fl_window_draw (This.Void_Ptr);
+        Group (This).Draw;
     end Draw;
 
 
@@ -736,10 +743,10 @@ package body FLTK.Widgets.Groups.Windows is
             Event : in     Event_Kind)
         return Event_Outcome is
     begin
-        return Event_Outcome'Val
-               (fl_window_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+        return Group (This).Handle (Event);
     end Handle;
 
 
 end FLTK.Widgets.Groups.Windows;
 
+