summaryrefslogtreecommitdiff
path: root/src/fltk-widgets-menus-menu_bars.adb
diff options
context:
space:
mode:
authorJedidiah Barber <contact@jedbarber.id.au>2025-01-12 01:14:58 +1300
committerJedidiah Barber <contact@jedbarber.id.au>2025-01-12 01:14:58 +1300
commite93b9bbc02e2791f3a35b6f077fcbb8514c28aed (patch)
tree3661530027db6809a9cbad7b2477416009e00787 /src/fltk-widgets-menus-menu_bars.adb
parent53aa8144851913994b963ed611cca8885b8f9a9e (diff)
Refactored draw/handle methods in Widgets hierarchy, improved docs, added a few minor method bindings here and there
Diffstat (limited to 'src/fltk-widgets-menus-menu_bars.adb')
-rw-r--r--src/fltk-widgets-menus-menu_bars.adb43
1 files changed, 26 insertions, 17 deletions
diff --git a/src/fltk-widgets-menus-menu_bars.adb b/src/fltk-widgets-menus-menu_bars.adb
index f0c9569..0548936 100644
--- a/src/fltk-widgets-menus-menu_bars.adb
+++ b/src/fltk-widgets-menus-menu_bars.adb
@@ -12,18 +12,9 @@ with
package body FLTK.Widgets.Menus.Menu_Bars is
- procedure menu_bar_set_draw_hook
- (W, D : in Storage.Integer_Address);
- pragma Import (C, menu_bar_set_draw_hook, "menu_bar_set_draw_hook");
- pragma Inline (menu_bar_set_draw_hook);
-
- procedure menu_bar_set_handle_hook
- (W, H : in Storage.Integer_Address);
- pragma Import (C, menu_bar_set_handle_hook, "menu_bar_set_handle_hook");
- pragma Inline (menu_bar_set_handle_hook);
-
-
-
+ ------------------------
+ -- Functions From C --
+ ------------------------
function new_fl_menu_bar
(X, Y, W, H : in Interfaces.C.int;
@@ -55,6 +46,10 @@ package body FLTK.Widgets.Menus.Menu_Bars is
+ -------------------
+ -- Destructors --
+ -------------------
+
procedure Extra_Final
(This : in out Menu_Bar) is
begin
@@ -75,6 +70,10 @@ package body FLTK.Widgets.Menus.Menu_Bars is
+ --------------------
+ -- Constructors --
+ --------------------
+
procedure Extra_Init
(This : in out Menu_Bar;
X, Y, W, H : in Integer;
@@ -84,6 +83,14 @@ package body FLTK.Widgets.Menus.Menu_Bars is
end Extra_Init;
+ procedure Initialize
+ (This : in out Menu_Bar) is
+ begin
+ This.Draw_Ptr := fl_menu_bar_draw'Address;
+ This.Handle_Ptr := fl_menu_bar_handle'Address;
+ end Initialize;
+
+
package body Forge is
function Create
@@ -99,8 +106,6 @@ package body FLTK.Widgets.Menus.Menu_Bars is
Interfaces.C.int (H),
Interfaces.C.To_C (Text));
Extra_Init (This, X, Y, W, H, Text);
- menu_bar_set_draw_hook (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
- menu_bar_set_handle_hook (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address));
end return;
end Create;
@@ -109,10 +114,14 @@ package body FLTK.Widgets.Menus.Menu_Bars is
+ -----------------------
+ -- API Subprograms --
+ -----------------------
+
procedure Draw
(This : in out Menu_Bar) is
begin
- fl_menu_bar_draw (This.Void_Ptr);
+ Menu (This).Draw;
end Draw;
@@ -121,10 +130,10 @@ package body FLTK.Widgets.Menus.Menu_Bars is
Event : in Event_Kind)
return Event_Outcome is
begin
- return Event_Outcome'Val
- (fl_menu_bar_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+ return Menu (This).Handle (Event);
end Handle;
end FLTK.Widgets.Menus.Menu_Bars;
+