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-environment.adb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/fltk-environment.adb') diff --git a/src/fltk-environment.adb b/src/fltk-environment.adb index c13c3ec..4cafb19 100644 --- a/src/fltk-environment.adb +++ b/src/fltk-environment.adb @@ -398,30 +398,21 @@ package body FLTK.Environment is procedure Finalize (This : in out Database) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Database'Class - then + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_pref_database (This.Void_Ptr); - This.Void_Ptr := Null_Pointer; end if; - Finalize (Wrapper (This)); end Finalize; procedure Finalize (This : in out Pref_Group) is begin - if This.Void_Ptr /= Null_Pointer and then - This in Pref_Group'Class - then + if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then free_fl_pref_group (This.Void_Ptr); if This.Root_Ptr /= Null_Pointer then free_fl_pref_database (This.Root_Ptr); - This.Root_Ptr := Null_Pointer; end if; - This.Void_Ptr := Null_Pointer; end if; - Finalize (Wrapper (This)); end Finalize; -- cgit