Added FLTK.Widgets.Groups.Input_Choices

10 files changed, 667 insertions, 4 deletions

diff --git a/progress.txt b/progress.txt
index 9780369..ddf56f0 100644
--- a/progress.txt
+++ b/progress.txt
@@ -33,6 +33,7 @@ FLTK.Widgets.Buttons.Toggle
 FLTK.Widgets.Clocks
 FLTK.Widgets.Clocks.Updated
 FLTK.Widgets.Clocks.Updated.Round
+FLTK.Widgets.Groups.Input_Choices
 FLTK.Widgets.Groups.Scrolls
 FLTK.Widgets.Groups.Spinners
 FLTK.Widgets.Groups.Tabbed
@@ -104,7 +105,6 @@ FL_Hold_Browser
 FL_Multi_Browser
 FL_Select_Browser
 FL_Color_Chooser
-FL_Input_Choice
 FL_Help_View (several methods have ABI_VERSION bugs)
 FL_Pack
 FL_Table
diff --git a/src/c_fl_input_choice.cpp b/src/c_fl_input_choice.cpp
new file mode 100644
index 0000000..a56d836
--- /dev/null
+++ b/src/c_fl_input_choice.cpp
@@ -0,0 +1,136 @@
+
+
+#include <FL/Fl_Input_Choice.H>
+#include "c_fl_input_choice.h"
+#include "c_fl_type.h"
+
+
+
+
+class My_Input_Choice : public Fl_Input_Choice {
+    public:
+        using Fl_Input_Choice::Fl_Input_Choice;
+        friend void input_choice_set_draw_hook(INPUT_CHOICE n, void * d);
+        friend void fl_input_choice_draw(INPUT_CHOICE n);
+        friend void input_choice_set_handle_hook(INPUT_CHOICE n, void * h);
+        friend int fl_input_choice_handle(INPUT_CHOICE n, int e);
+    protected:
+        void draw();
+        void real_draw();
+        int handle(int e);
+        int real_handle(int e);
+        d_hook_p draw_hook;
+        h_hook_p handle_hook;
+};
+
+void My_Input_Choice::draw() {
+    (*draw_hook)(this->user_data());
+}
+
+void My_Input_Choice::real_draw() {
+    Fl_Input_Choice::draw();
+}
+
+int My_Input_Choice::handle(int e) {
+    return (*handle_hook)(this->user_data(), e);
+}
+
+int My_Input_Choice::real_handle(int e) {
+    return Fl_Input_Choice::handle(e);
+}
+
+void input_choice_set_draw_hook(INPUT_CHOICE n, void * d) {
+    reinterpret_cast<My_Input_Choice*>(n)->draw_hook = reinterpret_cast<d_hook_p>(d);
+}
+
+void fl_input_choice_draw(INPUT_CHOICE n) {
+    reinterpret_cast<My_Input_Choice*>(n)->real_draw();
+}
+
+void input_choice_set_handle_hook(INPUT_CHOICE n, void * h) {
+    reinterpret_cast<My_Input_Choice*>(n)->handle_hook = reinterpret_cast<h_hook_p>(h);
+}
+
+int fl_input_choice_handle(INPUT_CHOICE n, int e) {
+    return reinterpret_cast<My_Input_Choice*>(n)->real_handle(e);
+}
+
+
+
+
+INPUT_CHOICE new_fl_input_choice(int x, int y, int w, int h, char* label) {
+    My_Input_Choice *n = new My_Input_Choice(x, y, w, h, label);
+    return n;
+}
+
+void free_fl_input_choice(INPUT_CHOICE n) {
+    delete reinterpret_cast<My_Input_Choice*>(n);
+}
+
+
+
+
+void * fl_input_choice_input(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->input();
+}
+
+void * fl_input_choice_menubutton(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->menubutton();
+}
+
+
+
+
+int fl_input_choice_changed(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->changed();
+}
+
+void fl_input_choice_clear_changed(INPUT_CHOICE n) {
+    reinterpret_cast<My_Input_Choice*>(n)->clear_changed();
+}
+
+int fl_input_choice_get_down_box(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->down_box();
+}
+
+void fl_input_choice_set_down_box(INPUT_CHOICE n, int t) {
+    reinterpret_cast<My_Input_Choice*>(n)->down_box(static_cast<Fl_Boxtype>(t));
+}
+
+unsigned int fl_input_choice_get_textcolor(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->textcolor();
+}
+
+void fl_input_choice_set_textcolor(INPUT_CHOICE n, unsigned int t) {
+    reinterpret_cast<My_Input_Choice*>(n)->textcolor(t);
+}
+
+int fl_input_choice_get_textfont(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->textfont();
+}
+
+void fl_input_choice_set_textfont(INPUT_CHOICE n, int t) {
+    reinterpret_cast<My_Input_Choice*>(n)->textfont(t);
+}
+
+int fl_input_choice_get_textsize(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->textsize();
+}
+
+void fl_input_choice_set_textsize(INPUT_CHOICE n, int t) {
+    reinterpret_cast<My_Input_Choice*>(n)->textsize(t);
+}
+
+const char * fl_input_choice_get_value(INPUT_CHOICE n) {
+    return reinterpret_cast<My_Input_Choice*>(n)->value();
+}
+
+void fl_input_choice_set_value(INPUT_CHOICE n, const char * t) {
+    reinterpret_cast<My_Input_Choice*>(n)->value(t);
+}
+
+void fl_input_choice_set_value2(INPUT_CHOICE n, int t) {
+    reinterpret_cast<My_Input_Choice*>(n)->value(t);
+}
+
+
diff --git a/src/c_fl_input_choice.h b/src/c_fl_input_choice.h
new file mode 100644
index 0000000..8ad700b
--- /dev/null
+++ b/src/c_fl_input_choice.h
@@ -0,0 +1,48 @@
+
+
+#ifndef FL_INPUT_CHOICE_GUARD
+#define FL_INPUT_CHOICE_GUARD
+
+
+
+
+typedef void* INPUT_CHOICE;
+
+
+
+
+extern "C" void input_choice_set_draw_hook(INPUT_CHOICE n, void * d);
+extern "C" void fl_input_choice_draw(INPUT_CHOICE n);
+extern "C" void input_choice_set_handle_hook(INPUT_CHOICE n, void * h);
+extern "C" int fl_input_choice_handle(INPUT_CHOICE n, int e);
+
+
+
+
+extern "C" INPUT_CHOICE new_fl_input_choice(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_input_choice(INPUT_CHOICE n);
+
+
+
+
+extern "C" void * fl_input_choice_input(INPUT_CHOICE n);
+extern "C" void * fl_input_choice_menubutton(INPUT_CHOICE n);
+
+
+extern "C" int fl_input_choice_changed(INPUT_CHOICE n);
+extern "C" void fl_input_choice_clear_changed(INPUT_CHOICE n);
+extern "C" int fl_input_choice_get_down_box(INPUT_CHOICE n);
+extern "C" void fl_input_choice_set_down_box(INPUT_CHOICE n, int t);
+extern "C" unsigned int fl_input_choice_get_textcolor(INPUT_CHOICE n);
+extern "C" void fl_input_choice_set_textcolor(INPUT_CHOICE n, unsigned int t);
+extern "C" int fl_input_choice_get_textfont(INPUT_CHOICE n);
+extern "C" void fl_input_choice_set_textfont(INPUT_CHOICE n, int t);
+extern "C" int fl_input_choice_get_textsize(INPUT_CHOICE n);
+extern "C" void fl_input_choice_set_textsize(INPUT_CHOICE n, int t);
+extern "C" const char * fl_input_choice_get_value(INPUT_CHOICE n);
+extern "C" void fl_input_choice_set_value(INPUT_CHOICE n, const char * t);
+extern "C" void fl_input_choice_set_value2(INPUT_CHOICE n, int t);
+
+
+#endif
+
diff --git a/src/fltk-widgets-groups-input_choices.adb b/src/fltk-widgets-groups-input_choices.adb
new file mode 100644
index 0000000..76bd3f9
--- /dev/null
+++ b/src/fltk-widgets-groups-input_choices.adb
@@ -0,0 +1,344 @@
+
+
+with
+
+    Ada.Unchecked_Deallocation,
+    Interfaces.C.Strings,
+    System;
+
+use type
+
+    Interfaces.C.int,
+    System.Address;
+
+
+package body FLTK.Widgets.Groups.Input_Choices is
+
+
+    procedure input_choice_set_draw_hook
+           (W, D : in System.Address);
+    pragma Import (C, input_choice_set_draw_hook, "input_choice_set_draw_hook");
+
+    procedure input_choice_set_handle_hook
+           (W, H : in System.Address);
+    pragma Import (C, input_choice_set_handle_hook, "input_choice_set_handle_hook");
+
+
+
+
+    function new_fl_input_choice
+           (X, Y, W, H : in Interfaces.C.int;
+            Text       : in Interfaces.C.char_array)
+        return System.Address;
+    pragma Import (C, new_fl_input_choice, "new_fl_input_choice");
+
+    procedure free_fl_input_choice
+           (W : in System.Address);
+    pragma Import (C, free_fl_input_choice, "free_fl_input_choice");
+
+
+
+
+    function fl_input_choice_input
+           (N : in System.Address)
+        return System.Address;
+    pragma Import (C, fl_input_choice_input, "fl_input_choice_input");
+
+    function fl_input_choice_menubutton
+           (N : in System.Address)
+        return System.Address;
+    pragma Import (C, fl_input_choice_menubutton, "fl_input_choice_menubutton");
+
+
+
+
+    function fl_input_choice_changed
+           (N : in System.Address)
+        return Interfaces.C.int;
+    pragma Import (C, fl_input_choice_changed, "fl_input_choice_changed");
+
+    procedure fl_input_choice_clear_changed
+           (N : in System.Address);
+    pragma Import (C, fl_input_choice_clear_changed, "fl_input_choice_clear_changed");
+
+    function fl_input_choice_get_down_box
+           (N : in System.Address)
+        return Interfaces.C.int;
+    pragma Import (C, fl_input_choice_get_down_box, "fl_input_choice_get_down_box");
+
+    procedure fl_input_choice_set_down_box
+           (N : in System.Address;
+            T : in Interfaces.C.int);
+    pragma Import (C, fl_input_choice_set_down_box, "fl_input_choice_set_down_box");
+
+    function fl_input_choice_get_textcolor
+           (N : in System.Address)
+        return Interfaces.C.unsigned;
+    pragma Import (C, fl_input_choice_get_textcolor, "fl_input_choice_get_textcolor");
+
+    procedure fl_input_choice_set_textcolor
+           (N : in System.Address;
+            T : in Interfaces.C.unsigned);
+    pragma Import (C, fl_input_choice_set_textcolor, "fl_input_choice_set_textcolor");
+
+    function fl_input_choice_get_textfont
+           (N : in System.Address)
+        return Interfaces.C.int;
+    pragma Import (C, fl_input_choice_get_textfont, "fl_input_choice_get_textfont");
+
+    procedure fl_input_choice_set_textfont
+           (N : in System.Address;
+            T : in Interfaces.C.int);
+    pragma Import (C, fl_input_choice_set_textfont, "fl_input_choice_set_textfont");
+
+    function fl_input_choice_get_textsize
+           (N : in System.Address)
+        return Interfaces.C.int;
+    pragma Import (C, fl_input_choice_get_textsize, "fl_input_choice_get_textsize");
+
+    procedure fl_input_choice_set_textsize
+           (N : in System.Address;
+            T : in Interfaces.C.int);
+    pragma Import (C, fl_input_choice_set_textsize, "fl_input_choice_set_textsize");
+
+    function fl_input_choice_get_value
+           (N : in System.Address)
+        return Interfaces.C.Strings.chars_ptr;
+    pragma Import (C, fl_input_choice_get_value, "fl_input_choice_get_value");
+
+    procedure fl_input_choice_set_value
+           (N : in System.Address;
+            T : in Interfaces.C.char_array);
+    pragma Import (C, fl_input_choice_set_value, "fl_input_choice_set_value");
+
+    procedure fl_input_choice_set_value2
+           (N : in System.Address;
+            T : in Interfaces.C.int);
+    pragma Import (C, fl_input_choice_set_value2, "fl_input_choice_set_value2");
+
+
+
+
+    procedure fl_input_choice_draw
+           (W : in System.Address);
+    pragma Import (C, fl_input_choice_draw, "fl_input_choice_draw");
+
+    function fl_input_choice_handle
+           (W : in System.Address;
+            E : in Interfaces.C.int)
+        return Interfaces.C.int;
+    pragma Import (C, fl_input_choice_handle, "fl_input_choice_handle");
+
+
+
+
+    procedure Free is new Ada.Unchecked_Deallocation
+        (INP.Input, Input_Access);
+    procedure Free is new Ada.Unchecked_Deallocation
+        (MB.Menu_Button, Menu_Button_Access);
+
+
+
+
+    procedure Finalize
+           (This : in out Input_Choice) is
+    begin
+        if  This.Void_Ptr /= System.Null_Address and then
+            This in Input_Choice'Class
+        then
+            This.Clear;
+            free_fl_input_choice (This.Void_Ptr);
+            Free (This.My_Input);
+            Free (This.My_Menu_Button);
+            This.Void_Ptr := System.Null_Address;
+        end if;
+        Finalize (Group (This));
+    end Finalize;
+
+
+
+
+    package body Forge is
+
+        function Create
+               (X, Y, W, H : in Integer;
+                Text       : in String)
+            return Input_Choice is
+        begin
+            return This : Input_Choice do
+                This.Void_Ptr := new_fl_input_choice
+                       (Interfaces.C.int (X),
+                        Interfaces.C.int (Y),
+                        Interfaces.C.int (W),
+                        Interfaces.C.int (H),
+                        Interfaces.C.To_C (Text));
+                fl_group_end (This.Void_Ptr);
+                fl_widget_set_user_data
+                       (This.Void_Ptr,
+                        Widget_Convert.To_Address (This'Unchecked_Access));
+                input_choice_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
+                input_choice_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+
+                This.My_Input := new INP.Input;
+                Wrapper (This.My_Input.all).Void_Ptr :=
+                    fl_input_choice_input (This.Void_Ptr);
+                Wrapper (This.My_Input.all).Needs_Dealloc := False;
+
+                This.My_Menu_Button := new MB.Menu_Button;
+                Wrapper (This.My_Menu_Button.all).Void_Ptr :=
+                    fl_input_choice_menubutton (This.Void_Ptr);
+                Wrapper (This.My_Menu_Button.all).Needs_Dealloc := False;
+            end return;
+        end Create;
+
+    end Forge;
+
+
+
+
+    function Input
+           (This : in out Input_Choice)
+        return INP.Input_Cursor is
+    begin
+        return (Data => This.My_Input);
+    end Input;
+
+
+    function Menu_Button
+           (This : in out Input_Choice)
+        return MB.Menu_Button_Cursor is
+    begin
+        return (Data => This.My_Menu_Button);
+    end Menu_Button;
+
+
+
+
+    function Has_Changed
+           (This : in Input_Choice)
+        return Boolean is
+    begin
+        return fl_input_choice_changed (This.Void_Ptr) /= 0;
+    end Has_Changed;
+
+
+    procedure Clear_Changed
+           (This : in out Input_Choice) is
+    begin
+        fl_input_choice_clear_changed (This.Void_Ptr);
+    end Clear_Changed;
+
+
+    function Get_Down_Box
+           (This : in Input_Choice)
+        return Box_Kind is
+    begin
+        return Box_Kind'Val (fl_input_choice_get_down_box (This.Void_Ptr));
+    end Get_Down_Box;
+
+
+    procedure Set_Down_Box
+           (This : in out Input_Choice;
+            To   : in     Box_Kind) is
+    begin
+        fl_input_choice_set_down_box (This.Void_Ptr, Box_Kind'Pos (To));
+    end Set_Down_Box;
+
+
+    function Get_Text_Color
+           (This : in Input_Choice)
+        return Color is
+    begin
+        return Color (fl_input_choice_get_textcolor (This.Void_Ptr));
+    end Get_Text_Color;
+
+
+    procedure Set_Text_Color
+           (This : in out Input_Choice;
+            To   : in     Color) is
+    begin
+        fl_input_choice_set_textcolor (This.Void_Ptr, Interfaces.C.unsigned (To));
+    end Set_Text_Color;
+
+
+    function Get_Text_Font
+           (This : in Input_Choice)
+        return Font_Kind is
+    begin
+        return Font_Kind'Val (fl_input_choice_get_textfont (This.Void_Ptr));
+    end Get_Text_Font;
+
+
+    procedure Set_Text_Font
+           (This : in out Input_Choice;
+            To   : in     Font_Kind) is
+    begin
+        fl_input_choice_set_textfont (This.Void_Ptr, Font_Kind'Pos (To));
+    end Set_Text_Font;
+
+
+    function Get_Text_Size
+           (This : in Input_Choice)
+        return Font_Size is
+    begin
+        return Font_Size (fl_input_choice_get_textsize (This.Void_Ptr));
+    end Get_Text_Size;
+
+
+    procedure Set_Text_Size
+           (This : in out Input_Choice;
+            To   : in     Font_Size) is
+    begin
+        fl_input_choice_set_textsize (This.Void_Ptr, Interfaces.C.int (To));
+    end Set_Text_Size;
+
+
+    function Get_Input
+           (This : in Input_Choice)
+        return String
+    is
+        C_Str : Interfaces.C.Strings.chars_ptr := fl_input_choice_get_value (This.Void_Ptr);
+        The_Text : String := Interfaces.C.Strings.Value (C_Str);
+    begin
+        Interfaces.C.Strings.Free (C_Str);
+        return The_Text;
+    end Get_Input;
+
+
+    procedure Set_Input
+           (This : in out Input_Choice;
+            To   : in     String) is
+    begin
+        fl_input_choice_set_value (This.Void_Ptr, Interfaces.C.To_C (To));
+    end Set_Input;
+
+
+    procedure Set_Item
+           (This : in out Input_Choice;
+            Num  : in     Integer) is
+    begin
+        fl_input_choice_set_value2 (This.Void_Ptr, Interfaces.C.int (Num));
+    end Set_Item;
+
+
+
+
+    procedure Draw
+           (This : in out Input_Choice) is
+    begin
+        fl_input_choice_draw (This.Void_Ptr);
+    end Draw;
+
+
+    function Handle
+           (This  : in out Input_Choice;
+            Event : in     Event_Kind)
+        return Event_Outcome is
+    begin
+        return Event_Outcome'Val
+               (fl_input_choice_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+    end Handle;
+
+
+end FLTK.Widgets.Groups.Input_Choices;
+
diff --git a/src/fltk-widgets-groups-input_choices.ads b/src/fltk-widgets-groups-input_choices.ads
new file mode 100644
index 0000000..98fcded
--- /dev/null
+++ b/src/fltk-widgets-groups-input_choices.ads
@@ -0,0 +1,124 @@
+
+
+with
+
+    FLTK.Widgets.Inputs,
+    FLTK.Widgets.Menus.Menu_Buttons;
+
+
+package FLTK.Widgets.Groups.Input_Choices is
+
+
+    type Input_Choice is new Group with private;
+
+
+
+
+    package Forge is
+
+        function Create
+               (X, Y, W, H : in Integer;
+                Text       : in String)
+            return Input_Choice;
+
+    end Forge;
+
+
+
+
+    function Input
+           (This : in out Input_Choice)
+        return FLTK.Widgets.Inputs.Input_Cursor;
+
+    function Menu_Button
+           (This : in out Input_Choice)
+        return FLTK.Widgets.Menus.Menu_Buttons.Menu_Button_Cursor;
+
+
+
+
+    function Has_Changed
+           (This : in Input_Choice)
+        return Boolean;
+
+    procedure Clear_Changed
+           (This : in out Input_Choice);
+
+    function Get_Down_Box
+           (This : in Input_Choice)
+        return Box_Kind;
+
+    procedure Set_Down_Box
+           (This : in out Input_Choice;
+            To   : in     Box_Kind);
+
+    function Get_Text_Color
+           (This : in Input_Choice)
+        return Color;
+
+    procedure Set_Text_Color
+           (This : in out Input_Choice;
+            To   : in     Color);
+
+    function Get_Text_Font
+           (This : in Input_Choice)
+        return Font_Kind;
+
+    procedure Set_Text_Font
+           (This : in out Input_Choice;
+            To   : in     Font_Kind);
+
+    function Get_Text_Size
+           (This : in Input_Choice)
+        return Font_Size;
+
+    procedure Set_Text_Size
+           (This : in out Input_Choice;
+            To   : in     Font_Size);
+
+    function Get_Input
+           (This : in Input_Choice)
+        return String;
+
+    procedure Set_Input
+           (This : in out Input_Choice;
+            To   : in     String);
+
+    procedure Set_Item
+           (This : in out Input_Choice;
+            Num  : in     Integer);
+
+
+
+
+    procedure Draw
+           (This : in out Input_Choice);
+
+    function Handle
+           (This  : in out Input_Choice;
+            Event : in     Event_Kind)
+        return Event_Outcome;
+
+
+private
+
+
+    package INP renames FLTK.Widgets.Inputs;
+    package MB renames FLTK.Widgets.Menus.Menu_Buttons;
+
+
+    type Input_Access is access INP.Input;
+    type Menu_Button_Access is access MB.Menu_Button;
+
+
+    type Input_Choice is new Group with record
+        My_Input       : Input_Access;
+        My_Menu_Button : Menu_Button_Access;
+    end record;
+
+    overriding procedure Finalize
+           (This : in out Input_Choice);
+
+
+end FLTK.Widgets.Groups.Input_Choices;
+
diff --git a/src/fltk-widgets-inputs.adb b/src/fltk-widgets-inputs.adb
index 6d2ee20..b5134ae 100644
--- a/src/fltk-widgets-inputs.adb
+++ b/src/fltk-widgets-inputs.adb
@@ -56,7 +56,9 @@ package body FLTK.Widgets.Inputs is
         if  This.Void_Ptr /= System.Null_Address and then
             This in Input'Class
         then
-            free_fl_input (This.Void_Ptr);
+            if This.Needs_Dealloc then
+                free_fl_input (This.Void_Ptr);
+            end if;
             This.Void_Ptr := System.Null_Address;
         end if;
         Finalize (Widget (This));
diff --git a/src/fltk-widgets-inputs.ads b/src/fltk-widgets-inputs.ads
index 9c80b81..2531cfa 100644
--- a/src/fltk-widgets-inputs.ads
+++ b/src/fltk-widgets-inputs.ads
@@ -11,6 +11,9 @@ package FLTK.Widgets.Inputs is
 
     type Input is new Widget with private;
 
+    type Input_Cursor (Data : access Input'Class) is limited null record
+        with Implicit_Dereference => Data;
+
 
 
 
diff --git a/src/fltk-widgets-menus-menu_buttons.adb b/src/fltk-widgets-menus-menu_buttons.adb
index 1a8e17b..8c39887 100644
--- a/src/fltk-widgets-menus-menu_buttons.adb
+++ b/src/fltk-widgets-menus-menu_buttons.adb
@@ -64,7 +64,9 @@ package body FLTK.Widgets.Menus.Menu_Buttons is
         if  This.Void_Ptr /= System.Null_Address and then
             This in Menu_Button'Class
         then
-            free_fl_menu_button (This.Void_Ptr);
+            if This.Needs_Dealloc then
+                free_fl_menu_button (This.Void_Ptr);
+            end if;
             This.Void_Ptr := System.Null_Address;
         end if;
         Finalize (Menu (This));
diff --git a/src/fltk-widgets-menus-menu_buttons.ads b/src/fltk-widgets-menus-menu_buttons.ads
index 86e29bb..fe1092a 100644
--- a/src/fltk-widgets-menus-menu_buttons.ads
+++ b/src/fltk-widgets-menus-menu_buttons.ads
@@ -5,6 +5,9 @@ package FLTK.Widgets.Menus.Menu_Buttons is
 
     type Menu_Button is new Menu with private;
 
+    type Menu_Button_Cursor (Data : access Menu_Button'Class) is limited null record
+        with Implicit_Dereference => Data;
+
     --  signifies which mouse buttons cause the menu to appear
     type Popup_Buttons is (No_Popup, Popup1, Popup2, Popup12, Popup3, Popup13, Popup23, Popup123);
 
diff --git a/src/fltk.ads b/src/fltk.ads
index 8a6a933..91a7b94 100644
--- a/src/fltk.ads
+++ b/src/fltk.ads
@@ -201,7 +201,8 @@ private
 
     type Wrapper is abstract new Ada.Finalization.Limited_Controlled with
         record
-            Void_Ptr : System.Address;
+            Void_Ptr      : System.Address;
+            Needs_Dealloc : Boolean := True;
         end record;
         --  with Type_Invariant => Has_Valid_Ptr (Wrapper);