Reworked widget init/create subprograms

1 files changed, 19 insertions, 5 deletions

diff --git a/src/fltk-widgets-groups.adb b/src/fltk-widgets-groups.adb
index 5ab1f5f..3f07083 100644
--- a/src/fltk-widgets-groups.adb
+++ b/src/fltk-widgets-groups.adb
@@ -44,6 +44,14 @@ package body FLTK.Widgets.Groups is
 
 
 
+    procedure fl_group_end
+           (G : in Storage.Integer_Address);
+    pragma Import (C, fl_group_end, "fl_group_end");
+    pragma Inline (fl_group_end);
+
+
+
+
     procedure fl_group_add
            (G, W : in Storage.Integer_Address);
     pragma Import (C, fl_group_add, "fl_group_add");
@@ -174,6 +182,16 @@ package body FLTK.Widgets.Groups is
 
 
 
+    procedure Extra_Init
+           (This       : in out Group;
+            X, Y, W, H : in     Integer;
+            Text       : in     String) is
+    begin
+        fl_group_end (This.Void_Ptr);
+        Extra_Init (Widget (This), X, Y, W, H, Text);
+    end Extra_Init;
+
+
     package body Forge is
 
         function Create
@@ -188,13 +206,9 @@ package body FLTK.Widgets.Groups is
                         Interfaces.C.int (W),
                         Interfaces.C.int (H),
                         Interfaces.C.To_C (Text));
-                fl_group_end (This.Void_Ptr);
-                fl_widget_set_user_data
-                       (This.Void_Ptr,
-                        Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access)));
+                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));
-                fl_widget_set_label (This.Void_Ptr, Interfaces.C.To_C (Text));
             end return;
         end Create;