Draw method implemented for Groups, Menus, although Menus are now no longer abstract even though they should be

1 files changed, 78 insertions, 0 deletions

diff --git a/src/fltk-widgets-menus.adb b/src/fltk-widgets-menus.adb
index b92f0a1..afb007c 100644
--- a/src/fltk-widgets-menus.adb
+++ b/src/fltk-widgets-menus.adb
@@ -21,6 +21,24 @@ package body FLTK.Widgets.Menus is
 
 
 
+    procedure menu_set_draw_hook
+           (W, D : in System.Address);
+    pragma Import (C, menu_set_draw_hook, "menu_set_draw_hook");
+
+    procedure fl_menu_draw
+           (W : in System.Address);
+    pragma Import (C, fl_menu_draw, "fl_menu_draw");
+
+    function new_fl_menu
+           (X, Y, W, H : in Interfaces.C.int;
+            Text       : in Interfaces.C.char_array)
+        return System.Address;
+    pragma Import (C, new_fl_menu, "new_fl_menu");
+
+    procedure free_fl_menu
+           (F : in System.Address);
+    pragma Import (C, free_fl_menu, "free_fl_menu");
+
     function fl_menu_add
            (M    : in System.Address;
             T    : in Interfaces.C.char_array;
@@ -57,6 +75,66 @@ package body FLTK.Widgets.Menus is
 
 
 
+    procedure Draw_Hook (U : in System.Address);
+    pragma Convention (C, Draw_Hook);
+
+    procedure Draw_Hook
+           (U : in System.Address)
+    is
+        Ada_Menu : access Menu'Class :=
+            Menu_Convert.To_Pointer (U);
+    begin
+        Ada_Menu.Draw;
+    end Draw_Hook;
+
+
+
+
+    procedure Draw
+           (This : in out Menu) is
+    begin
+        fl_menu_draw (This.Void_Ptr);
+    end Draw;
+
+
+
+
+    procedure Finalize
+           (This : in out Menu) is
+    begin
+        Finalize (Widget (This));
+        if This.Void_Ptr /= System.Null_Address then
+            if This in Menu then
+                free_fl_menu (This.Void_Ptr);
+            end if;
+        end if;
+    end Finalize;
+
+
+
+
+    function Create
+           (X, Y, W, H : in Integer;
+            Text       : in String)
+        return Menu is
+    begin
+        return This : Menu do
+            This.Void_Ptr := new_fl_menu
+                   (Interfaces.C.int (X),
+                    Interfaces.C.int (Y),
+                    Interfaces.C.int (W),
+                    Interfaces.C.int (H),
+                    Interfaces.C.To_C (Text));
+            fl_widget_set_user_data
+                   (This.Void_Ptr,
+                    Widget_Convert.To_Address (This'Unchecked_Access));
+            menu_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
+        end return;
+    end Create;
+
+
+
+
     procedure Item_Hook (M, U : in System.Address);
     pragma Convention (C, Item_Hook);