Reworked widget init/create subprograms

1 files changed, 6 insertions, 13 deletions

diff --git a/src/fltk-widgets-groups-input_choices.ads b/src/fltk-widgets-groups-input_choices.ads
index 5468450..1cc2f2f 100644
--- a/src/fltk-widgets-groups-input_choices.ads
+++ b/src/fltk-widgets-groups-input_choices.ads
@@ -120,29 +120,23 @@ package FLTK.Widgets.Groups.Input_Choices is
 private
 
 
-    package INP renames FLTK.Widgets.Inputs;
-    package MB renames FLTK.Widgets.Menus.Menu_Buttons;
-
-
-    type Input_Access is access INP.Input;
-    type Menu_Button_Access is access MB.Menu_Button;
-
-
     type Input_Choice is new Group with record
-        My_Input       : Input_Access;
-        My_Menu_Button : Menu_Button_Access;
+        My_Input       : aliased Inputs.Input;
+        My_Menu_Button : aliased Menus.Menu_Buttons.Menu_Button;
     end record;
 
     overriding procedure Finalize
            (This : in out Input_Choice);
 
-
+    procedure Extra_Init
+           (This       : in out Input_Choice;
+            X, Y, W, H : in     Integer;
+            Text       : in     String);
 
 
     pragma Inline (Input);
     pragma Inline (Menu_Button);
 
-
     pragma Inline (Has_Changed);
     pragma Inline (Clear_Changed);
     pragma Inline (Get_Down_Box);
@@ -157,7 +151,6 @@ private
     pragma Inline (Set_Input);
     pragma Inline (Set_Item);
 
-
     pragma Inline (Draw);
     pragma Inline (Handle);