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

1 files changed, 9 insertions, 5 deletions

diff --git a/src/fltk-widgets-clocks-updated.adb b/src/fltk-widgets-clocks-updated.adb
index b9eabea..9ca47ce 100644
--- a/src/fltk-widgets-clocks-updated.adb
+++ b/src/fltk-widgets-clocks-updated.adb
@@ -69,16 +69,20 @@ package body FLTK.Widgets.Clocks.Updated is
 
 
 
+    procedure Extra_Final
+           (This : in out Updated_Clock) is
+    begin
+        Extra_Final (Clock (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Updated_Clock) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Updated_Clock'Class
-        then
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_clock (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Clock (This));
     end Finalize;