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-menus-choices.adb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/fltk-widgets-menus-choices.adb') diff --git a/src/fltk-widgets-menus-choices.adb b/src/fltk-widgets-menus-choices.adb index b306c9b..211114f 100644 --- a/src/fltk-widgets-menus-choices.adb +++ b/src/fltk-widgets-menus-choices.adb @@ -82,21 +82,24 @@ package body FLTK.Widgets.Menus.Choices is + procedure Extra_Final + (This : in out Choice) is + begin + Extra_Final (Menu (This)); + end Extra_Final; + procedure Finalize (This : in out Choice) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Choice'Class - then - if This.Needs_Dealloc then - free_fl_choice (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_choice (This.Void_Ptr); end if; - Finalize (Widget (This)); end Finalize; + + procedure Extra_Init (This : in out Choice; X, Y, W, H : in Integer; -- cgit