Refactored Finalize subprograms and made note of potential future Widget issues there in fltk.ads

1 files changed, 9 insertions, 6 deletions

diff --git a/src/fltk-widgets-groups-color_choosers.adb b/src/fltk-widgets-groups-color_choosers.adb
index c66ae1a..cd97fb3 100644
--- a/src/fltk-widgets-groups-color_choosers.adb
+++ b/src/fltk-widgets-groups-color_choosers.adb
@@ -145,17 +145,20 @@ package body FLTK.Widgets.Groups.Color_Choosers is
 
 
 
+    procedure Extra_Final
+           (This : in out Color_Chooser) is
+    begin
+        Extra_Final (Group (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Color_Chooser) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Color_Chooser'Class
-        then
-            This.Clear;
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_color_chooser (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Group (This));
     end Finalize;