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-text_displays.adb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/fltk-widgets-groups-text_displays.adb') diff --git a/src/fltk-widgets-groups-text_displays.adb b/src/fltk-widgets-groups-text_displays.adb index d818490..d8e296f 100644 --- a/src/fltk-widgets-groups-text_displays.adb +++ b/src/fltk-widgets-groups-text_displays.adb @@ -466,18 +466,21 @@ package body FLTK.Widgets.Groups.Text_Displays is + procedure Extra_Final + (This : in out Text_Display) is + begin + Extra_Final (Group (This)); + end Extra_Final; + + procedure Finalize (This : in out Text_Display) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Text_Display'Class - then - This.Clear; + Extra_Final (This); + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_text_display (This.Void_Ptr); free_fl_text_buffer (This.Raw_Buffer); - This.Void_Ptr := Null_Pointer; end if; - Finalize (Group (This)); end Finalize; -- cgit