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

1 files changed, 10 insertions, 7 deletions

diff --git a/src/fltk-widgets-groups-help_views.adb b/src/fltk-widgets-groups-help_views.adb
index 385e0eb..24a592f 100644
--- a/src/fltk-widgets-groups-help_views.adb
+++ b/src/fltk-widgets-groups-help_views.adb
@@ -267,18 +267,21 @@ package body FLTK.Widgets.Groups.Help_Views is
     --  Controlled Type Subprograms  --
     -----------------------------------
 
+    procedure Extra_Final
+           (This : in out Help_View) is
+    begin
+        Interfaces.C.Strings.Free (This.Hilda);
+        Extra_Final (Group (This));
+    end Extra_Final;
+
+
     procedure Finalize
            (This : in out Help_View) is
     begin
-        if  This.Void_Ptr /= Null_Pointer and then
-            This in Help_View'Class
-        then
-            This.Clear;
+        Extra_Final (This);
+        if This.Void_Ptr /= Null_Pointer and This.Needs_Dealloc then
             free_fl_help_view (This.Void_Ptr);
-            Interfaces.C.Strings.Free (This.Hilda);
-            This.Void_Ptr := Null_Pointer;
         end if;
-        Finalize (Group (This));
     end Finalize;