From f419b275ee91792e08f211a588d891c4aa6bedac Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Fri, 15 Jul 2016 22:20:30 +1000 Subject: Groups and Widgets should now keep track of themselves properly, also all named access types removed --- fltk-widgets-buttons-toggle.adb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'fltk-widgets-buttons-toggle.adb') diff --git a/fltk-widgets-buttons-toggle.adb b/fltk-widgets-buttons-toggle.adb index b6e7dc2..995f8bf 100644 --- a/fltk-widgets-buttons-toggle.adb +++ b/fltk-widgets-buttons-toggle.adb @@ -10,7 +10,7 @@ package body FLTK.Widgets.Buttons.Toggle is function new_fl_toggle_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_toggle_button, "new_fl_toggle_button"); @@ -24,8 +24,11 @@ package body FLTK.Widgets.Buttons.Toggle is procedure Finalize (This : in out Toggle_Button) is begin - if (This.Void_Ptr /= System.Null_Address) then - free_fl_toggle_button (This.Void_Ptr); + Finalize (Button (This)); + if This.Void_Ptr /= System.Null_Address then + if This in Toggle_Button then + free_fl_toggle_button (This.Void_Ptr); + end if; end if; end Finalize; @@ -34,19 +37,17 @@ package body FLTK.Widgets.Buttons.Toggle is function Create (X, Y, W, H : in Integer; - Label : in String) + Text : in String) return Toggle_Button is - - VP : System.Address; - begin - VP := new_fl_toggle_button + return This : Toggle_Button do + This.Void_Ptr := new_fl_toggle_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; -- cgit