From 619b3da9fbb37c57aedfc039cc813f6acf5569be Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Sun, 17 Nov 2024 17:15:53 +1300 Subject: Refactored Finalize subprograms and made note of potential future Widget issues there in fltk.ads --- src/fltk-widgets-groups-input_choices.adb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/fltk-widgets-groups-input_choices.adb') diff --git a/src/fltk-widgets-groups-input_choices.adb b/src/fltk-widgets-groups-input_choices.adb index 41994dc..7fc6870 100644 --- a/src/fltk-widgets-groups-input_choices.adb +++ b/src/fltk-widgets-groups-input_choices.adb @@ -168,20 +168,26 @@ package body FLTK.Widgets.Groups.Input_Choices is + procedure Extra_Final + (This : in out Input_Choice) is + begin + Extra_Final (Widget (This.My_Input)); + Extra_Final (Widget (This.My_Menu_Button)); + Extra_Final (Group (This)); + end Extra_Final; + procedure Finalize (This : in out Input_Choice) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Input_Choice'Class - then - Group (This).Clear; + Extra_Final (This); + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_input_choice (This.Void_Ptr); - This.Void_Ptr := Null_Pointer; end if; - Finalize (Group (This)); end Finalize; + + procedure Extra_Init (This : in out Input_Choice; X, Y, W, H : in Integer; -- cgit