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

1 files changed, 26 insertions, 17 deletions

diff --git a/src/fltk-widgets-groups.adb b/src/fltk-widgets-groups.adb
index 17cb4fa..491bd0d 100644
--- a/src/fltk-widgets-groups.adb
+++ b/src/fltk-widgets-groups.adb
@@ -16,18 +16,9 @@ use type
 package body FLTK.Widgets.Groups is
 
 
-    procedure group_set_draw_hook
-           (W, D : in Storage.Integer_Address);
-    pragma Import (C, group_set_draw_hook, "group_set_draw_hook");
-    pragma Inline (group_set_draw_hook);
-
-    procedure group_set_handle_hook
-           (W, H : in Storage.Integer_Address);
-    pragma Import (C, group_set_handle_hook, "group_set_handle_hook");
-    pragma Inline (group_set_handle_hook);
-
-
-
+    ------------------------
+    --  Functions From C  --
+    ------------------------
 
     function new_fl_group
            (X, Y, W, H : in Interfaces.C.int;
@@ -166,6 +157,10 @@ package body FLTK.Widgets.Groups is
 
 
 
+    -------------------
+    --  Destructors  --
+    -------------------
+
     procedure Extra_Final
            (This : in out Group) is
     begin
@@ -187,6 +182,10 @@ package body FLTK.Widgets.Groups is
 
 
 
+    --------------------
+    --  Constructors  --
+    --------------------
+
     procedure Extra_Init
            (This       : in out Group;
             X, Y, W, H : in     Integer;
@@ -197,6 +196,14 @@ package body FLTK.Widgets.Groups is
     end Extra_Init;
 
 
+    procedure Initialize
+           (This : in out Group) is
+    begin
+        This.Draw_Ptr   := fl_group_draw'Address;
+        This.Handle_Ptr := fl_group_handle'Address;
+    end Initialize;
+
+
     package body Forge is
 
         function Create
@@ -212,8 +219,6 @@ package body FLTK.Widgets.Groups is
                         Interfaces.C.int (H),
                         Interfaces.C.To_C (Text));
                 Extra_Init (This, X, Y, W, H, Text);
-                group_set_draw_hook (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
-                group_set_handle_hook (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address));
             end return;
         end Create;
 
@@ -222,6 +227,10 @@ package body FLTK.Widgets.Groups is
 
 
 
+    -----------------------
+    --  API Subprograms  --
+    -----------------------
+
     procedure Add
            (This : in out Group;
             Item : in out Widget'Class) is
@@ -477,7 +486,7 @@ package body FLTK.Widgets.Groups is
     procedure Draw
            (This : in out Group) is
     begin
-        fl_group_draw (This.Void_Ptr);
+        Widget (This).Draw;
     end Draw;
 
 
@@ -486,10 +495,10 @@ package body FLTK.Widgets.Groups is
             Event : in     Event_Kind)
         return Event_Outcome is
     begin
-        return Event_Outcome'Val
-               (fl_group_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+        return Widget (This).Handle (Event);
     end Handle;
 
 
 end FLTK.Widgets.Groups;
 
+