Moved Menu_Item code to separate FLTK child package

1 files changed, 7 insertions, 48 deletions

diff --git a/src/fltk-widgets-menus.adb b/src/fltk-widgets-menus.adb
index b97c966..d0c0ed7 100644
--- a/src/fltk-widgets-menus.adb
+++ b/src/fltk-widgets-menus.adb
@@ -2,6 +2,7 @@
 
 with Interfaces.C;
 with System;
+with FLTK.Menu_Items;
 use type System.Address;
 use type Interfaces.C.int;
 use type Interfaces.C.unsigned_long;
@@ -61,20 +62,6 @@ package body FLTK.Widgets.Menus is
     pragma Import (C, fl_menu_mvalue, "fl_menu_mvalue");
 
 
-    function fl_menuitem_value
-           (MI : in System.Address)
-        return Interfaces.C.int;
-    pragma Import (C, fl_menuitem_value, "fl_menuitem_value");
-
-    procedure fl_menuitem_activate
-           (MI : in System.Address);
-    pragma Import (C, fl_menuitem_activate, "fl_menuitem_activate");
-
-    procedure fl_menuitem_deactivate
-           (MI : in System.Address);
-    pragma Import (C, fl_menuitem_deactivate, "fl_menuitem_deactivate");
-
-
 
 
     procedure Item_Hook
@@ -161,10 +148,10 @@ package body FLTK.Widgets.Menus is
     function Find_Item
            (This : in Menu'Class;
             Name : in String)
-        return Menu_Item is
+        return FLTK.Menu_Items.Menu_Item is
     begin
-        return Item : Menu_Item do
-            Item.Void_Ptr := fl_menu_find_item
+        return Item : FLTK.Menu_Items.Menu_Item do
+            Wrapper (Item).Void_Ptr := fl_menu_find_item
                    (This.Void_Ptr,
                     Interfaces.C.To_C (Name));
         end return;
@@ -175,10 +162,10 @@ package body FLTK.Widgets.Menus is
 
     function Chosen
            (This : in Menu'Class)
-        return Menu_Item is
+        return FLTK.Menu_Items.Menu_Item is
     begin
-        return Item : Menu_Item do
-            Item.Void_Ptr := fl_menu_mvalue (This.Void_Ptr);
+        return Item : FLTK.Menu_Items.Menu_Item do
+            Wrapper (Item).Void_Ptr := fl_menu_mvalue (This.Void_Ptr);
         end return;
     end Chosen;
 
@@ -194,33 +181,5 @@ package body FLTK.Widgets.Menus is
     end Handle;
 
 
-
-
-    function Value
-           (Item : in Menu_Item)
-        return Boolean is
-    begin
-        return fl_menuitem_value (Item.Void_Ptr) /= 0;
-    end Value;
-
-
-
-
-    procedure Activate
-           (Item : in Menu_Item) is
-    begin
-        fl_menuitem_activate (Item.Void_Ptr);
-    end Activate;
-
-
-
-
-    procedure Deactivate
-           (Item : in Menu_Item) is
-    begin
-        fl_menuitem_deactivate (Item.Void_Ptr);
-    end Deactivate;
-
-
 end FLTK.Widgets.Menus;