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-menus-menu_bars.adb b/src/fltk-widgets-menus-menu_bars.adb
index 52279cd..3840f2e 100644
--- a/src/fltk-widgets-menus-menu_bars.adb
+++ b/src/fltk-widgets-menus-menu_bars.adb
@@ -55,16 +55,20 @@ package body FLTK.Widgets.Menus.Menu_Bars is
 
 
 
+    procedure Extra_Final
+           (This : in out Menu_Bar) is
+    begin
+        Extra_Final (Menu (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Menu_Bar) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Menu_Bar'Class
-        then
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_menu_bar (This.Void_Ptr);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Menu (This));
     end Finalize;