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-valuators-counters.adb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/fltk-widgets-valuators-counters.adb') diff --git a/src/fltk-widgets-valuators-counters.adb b/src/fltk-widgets-valuators-counters.adb index a31e389..a8cb10a 100644 --- a/src/fltk-widgets-valuators-counters.adb +++ b/src/fltk-widgets-valuators-counters.adb @@ -115,16 +115,20 @@ package body FLTK.Widgets.Valuators.Counters is + procedure Extra_Final + (This : in out Counter) is + begin + Extra_Final (Valuator (This)); + end Extra_Final; + + procedure Finalize (This : in out Counter) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Counter'Class - then + Extra_Final (This); + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_counter (This.Void_Ptr); - This.Void_Ptr := Null_Pointer; end if; - Finalize (Valuator (This)); end Finalize; -- cgit