diff options
Diffstat (limited to 'src/fltk-widgets-groups-windows-single-menu.adb')
| -rw-r--r-- | src/fltk-widgets-groups-windows-single-menu.adb | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/src/fltk-widgets-groups-windows-single-menu.adb b/src/fltk-widgets-groups-windows-single-menu.adb index d26b33f..8d562b2 100644 --- a/src/fltk-widgets-groups-windows-single-menu.adb +++ b/src/fltk-widgets-groups-windows-single-menu.adb @@ -2,12 +2,10 @@ with - Interfaces.C, - System; + Interfaces.C; use type - System.Address, Interfaces.C.unsigned; @@ -15,12 +13,12 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is procedure menu_window_set_draw_hook - (W, D : in System.Address); + (W, D : in Storage.Integer_Address); pragma Import (C, menu_window_set_draw_hook, "menu_window_set_draw_hook"); pragma Inline (menu_window_set_draw_hook); procedure menu_window_set_handle_hook - (W, H : in System.Address); + (W, H : in Storage.Integer_Address); pragma Import (C, menu_window_set_handle_hook, "menu_window_set_handle_hook"); pragma Inline (menu_window_set_handle_hook); @@ -30,19 +28,19 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is function new_fl_menu_window (X, Y, W, H : in Interfaces.C.int; Label : in Interfaces.C.char_array) - return System.Address; + return Storage.Integer_Address; pragma Import (C, new_fl_menu_window, "new_fl_menu_window"); pragma Inline (new_fl_menu_window); function new_fl_menu_window2 (W, H : in Interfaces.C.int; Text : in Interfaces.C.char_array) - return System.Address; + return Storage.Integer_Address; pragma Import (C, new_fl_menu_window2, "new_fl_menu_window2"); pragma Inline (new_fl_menu_window2); procedure free_fl_menu_window - (M : in System.Address); + (M : in Storage.Integer_Address); pragma Import (C, free_fl_menu_window, "free_fl_menu_window"); pragma Inline (free_fl_menu_window); @@ -50,17 +48,17 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is procedure fl_menu_window_show - (M : in System.Address); + (M : in Storage.Integer_Address); pragma Import (C, fl_menu_window_show, "fl_menu_window_show"); pragma Inline (fl_menu_window_show); procedure fl_menu_window_hide - (M : in System.Address); + (M : in Storage.Integer_Address); pragma Import (C, fl_menu_window_hide, "fl_menu_window_hide"); pragma Inline (fl_menu_window_hide); procedure fl_menu_window_flush - (M : in System.Address); + (M : in Storage.Integer_Address); pragma Import (C, fl_menu_window_flush, "fl_menu_window_flush"); pragma Inline (fl_menu_window_flush); @@ -68,17 +66,17 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is procedure fl_menu_window_set_overlay - (M : in System.Address); + (M : in Storage.Integer_Address); pragma Import (C, fl_menu_window_set_overlay, "fl_menu_window_set_overlay"); pragma Inline (fl_menu_window_set_overlay); procedure fl_menu_window_clear_overlay - (M : in System.Address); + (M : in Storage.Integer_Address); pragma Import (C, fl_menu_window_clear_overlay, "fl_menu_window_clear_overlay"); pragma Inline (fl_menu_window_clear_overlay); function fl_menu_window_overlay - (M : in System.Address) + (M : in Storage.Integer_Address) return Interfaces.C.unsigned; pragma Import (C, fl_menu_window_overlay, "fl_menu_window_overlay"); pragma Inline (fl_menu_window_overlay); @@ -87,12 +85,12 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is procedure fl_menu_window_draw - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_menu_window_draw, "fl_menu_window_draw"); pragma Inline (fl_menu_window_draw); function fl_menu_window_handle - (W : in System.Address; + (W : in Storage.Integer_Address; E : in Interfaces.C.int) return Interfaces.C.int; pragma Import (C, fl_menu_window_handle, "fl_menu_window_handle"); @@ -104,12 +102,12 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is procedure Finalize (This : in out Menu_Window) is begin - if This.Void_Ptr /= System.Null_Address and then + if This.Void_Ptr /= Null_Pointer and then This in Menu_Window'Class then This.Clear; free_fl_menu_window (This.Void_Ptr); - This.Void_Ptr := System.Null_Address; + This.Void_Ptr := Null_Pointer; end if; Finalize (Single_Window (This)); end Finalize; @@ -134,9 +132,11 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + menu_window_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + menu_window_set_handle_hook + (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address)); fl_widget_set_label (This.Void_Ptr, Interfaces.C.To_C (Text)); end return; end Create; @@ -155,9 +155,11 @@ package body FLTK.Widgets.Groups.Windows.Single.Menu is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - menu_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - menu_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + menu_window_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + menu_window_set_handle_hook + (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address)); fl_widget_set_label (This.Void_Ptr, Interfaces.C.To_C (Text)); end return; end Create; |