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-boxes.adb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/fltk-widgets-boxes.adb') diff --git a/src/fltk-widgets-boxes.adb b/src/fltk-widgets-boxes.adb index 56c7007..3194237 100644 --- a/src/fltk-widgets-boxes.adb +++ b/src/fltk-widgets-boxes.adb @@ -55,18 +55,20 @@ package body FLTK.Widgets.Boxes is + procedure Extra_Final + (This : in out Box) is + begin + Extra_Final (Widget (This)); + end Extra_Final; + + procedure Finalize (This : in out Box) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Box'Class - then - if This.Needs_Dealloc then - free_fl_box (This.Void_Ptr); - end if; - This.Void_Ptr := Null_Pointer; + Extra_Final (This); + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then + free_fl_box (This.Void_Ptr); end if; - Finalize (Widget (This)); end Finalize; -- cgit