1 files changed, 9 insertions, 5 deletions
diff --git a/src/fltk-widgets-buttons.adb b/src/fltk-widgets-buttons.adb
index 81bf3a8..a6c98d0 100644
--- a/src/fltk-widgets-buttons.adb
+++ b/src/fltk-widgets-buttons.adb
@@ -102,16 +102,20 @@ package body FLTK.Widgets.Buttons is
 
 
 
+    procedure Extra_Final
+           (This : in out Button) is
+    begin
+        Extra_Final (Widget (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Button) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Button'Class
-        then
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_button (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Widget (This));
     end Finalize;