1 files changed, 9 insertions, 6 deletions
diff --git a/src/fltk-widgets-groups-windows.adb b/src/fltk-widgets-groups-windows.adb
index d7cc362..af5cef7 100644
--- a/src/fltk-widgets-groups-windows.adb
+++ b/src/fltk-widgets-groups-windows.adb
@@ -300,17 +300,20 @@ package body FLTK.Widgets.Groups.Windows is
 
 
 
+    procedure Extra_Final
+           (This : in out Window) is
+    begin
+        Extra_Final (Group (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Window) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Window'Class
-        then
-            This.Clear;
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_window (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Group (This));
     end Finalize;