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-windows-single.adb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/fltk-widgets-groups-windows-single.adb') diff --git a/src/fltk-widgets-groups-windows-single.adb b/src/fltk-widgets-groups-windows-single.adb index 14618b9..a012920 100644 --- a/src/fltk-widgets-groups-windows-single.adb +++ b/src/fltk-widgets-groups-windows-single.adb @@ -75,17 +75,20 @@ package body FLTK.Widgets.Groups.Windows.Single is + procedure Extra_Final + (This : in out Single_Window) is + begin + Extra_Final (Window (This)); + end Extra_Final; + + procedure Finalize (This : in out Single_Window) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Single_Window'Class - then - This.Clear; + Extra_Final (This); + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_single_window (This.Void_Ptr); - This.Void_Ptr := Null_Pointer; end if; - Finalize (Window (This)); end Finalize; -- cgit