Groups and Widgets should now keep track of themselves properly, also all named access types removed

1 files changed, 10 insertions, 9 deletions

diff --git a/src/fltk_binding/fltk-widgets-buttons-light-round.adb b/src/fltk_binding/fltk-widgets-buttons-light-round.adb
index 555dcc4..553814b 100644
--- a/src/fltk_binding/fltk-widgets-buttons-light-round.adb
+++ b/src/fltk_binding/fltk-widgets-buttons-light-round.adb
@@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Light.Round is
 
     function new_fl_round_button
            (X, Y, W, H : in Interfaces.C.int;
-            Label      : in Interfaces.C.char_array)
+            Text       : in Interfaces.C.char_array)
         return System.Address;
     pragma Import (C, new_fl_round_button, "new_fl_round_button");
 
@@ -24,8 +24,11 @@ package body FLTK.Widgets.Buttons.Light.Round is
     procedure Finalize
            (This : in out Round_Button) is
     begin
+        Finalize (Light_Button (This));
         if (This.Void_Ptr /= System.Null_Address) then
-            free_fl_round_button (This.Void_Ptr);
+            if This in Round_Button then
+                free_fl_round_button (This.Void_Ptr);
+            end if;
         end if;
     end Finalize;
 
@@ -34,19 +37,17 @@ package body FLTK.Widgets.Buttons.Light.Round is
 
     function Create
            (X, Y, W, H : in Integer;
-            Label      : in String)
+            Text       : in String)
         return Round_Button is
-
-        VP : System.Address;
-
     begin
-        VP := new_fl_round_button
+        return This : Round_Button do
+            This.Void_Ptr := new_fl_round_button
                    (Interfaces.C.int (X),
                     Interfaces.C.int (Y),
                     Interfaces.C.int (W),
                     Interfaces.C.int (H),
-                    Interfaces.C.To_C (Label));
-        return (Ada.Finalization.Limited_Controlled with Void_Ptr => VP);
+                    Interfaces.C.To_C (Text));
+        end return;
     end Create;