From 87671a2f2423efacd0b0c4ad0c34c244680ef565 Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Sun, 13 Oct 2024 02:00:32 +1300 Subject: Changed System.Address to Integer_Address --- src/fltk-widgets-groups-windows-double-overlay.adb | 59 ++++++++++++---------- 1 file changed, 32 insertions(+), 27 deletions(-) (limited to 'src/fltk-widgets-groups-windows-double-overlay.adb') diff --git a/src/fltk-widgets-groups-windows-double-overlay.adb b/src/fltk-widgets-groups-windows-double-overlay.adb index e61782a..86c6d14 100644 --- a/src/fltk-widgets-groups-windows-double-overlay.adb +++ b/src/fltk-widgets-groups-windows-double-overlay.adb @@ -7,26 +7,25 @@ with use type - Interfaces.C.int, - System.Address; + Interfaces.C.int; package body FLTK.Widgets.Groups.Windows.Double.Overlay is procedure overlay_window_set_draw_hook - (W, D : in System.Address); + (W, D : in Storage.Integer_Address); pragma Import (C, overlay_window_set_draw_hook, "overlay_window_set_draw_hook"); pragma Inline (overlay_window_set_draw_hook); procedure overlay_window_set_draw_overlay_hook - (W, D : in System.Address); + (W, D : in Storage.Integer_Address); pragma Import (C, overlay_window_set_draw_overlay_hook, "overlay_window_set_draw_overlay_hook"); pragma Inline (overlay_window_set_draw_overlay_hook); procedure overlay_window_set_handle_hook - (W, H : in System.Address); + (W, H : in Storage.Integer_Address); pragma Import (C, overlay_window_set_handle_hook, "overlay_window_set_handle_hook"); pragma Inline (overlay_window_set_handle_hook); @@ -36,19 +35,19 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is function new_fl_overlay_window (X, Y, W, H : in Interfaces.C.int; Text : in Interfaces.C.char_array) - return System.Address; + return Storage.Integer_Address; pragma Import (C, new_fl_overlay_window, "new_fl_overlay_window"); pragma Inline (new_fl_overlay_window); function new_fl_overlay_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_overlay_window2, "new_fl_overlay_window2"); pragma Inline (new_fl_overlay_window2); procedure free_fl_overlay_window - (S : in System.Address); + (S : in Storage.Integer_Address); pragma Import (C, free_fl_overlay_window, "free_fl_overlay_window"); pragma Inline (free_fl_overlay_window); @@ -56,17 +55,17 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is procedure fl_overlay_window_show - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_overlay_window_show, "fl_overlay_window_show"); pragma Inline (fl_overlay_window_show); procedure fl_overlay_window_hide - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_overlay_window_hide, "fl_overlay_window_hide"); pragma Inline (fl_overlay_window_hide); procedure fl_overlay_window_flush - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_overlay_window_flush, "fl_overlay_window_flush"); pragma Inline (fl_overlay_window_flush); @@ -74,7 +73,7 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is function fl_overlay_window_can_do_overlay - (W : in System.Address) + (W : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_overlay_window_can_do_overlay, "fl_overlay_window_can_do_overlay"); pragma Inline (fl_overlay_window_can_do_overlay); @@ -83,17 +82,17 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is procedure fl_overlay_window_draw - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_overlay_window_draw, "fl_overlay_window_draw"); pragma Inline (fl_overlay_window_draw); procedure fl_overlay_window_redraw_overlay - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_overlay_window_redraw_overlay, "fl_overlay_window_redraw_overlay"); pragma Inline (fl_overlay_window_redraw_overlay); function fl_overlay_window_handle - (W : in System.Address; + (W : in Storage.Integer_Address; E : in Interfaces.C.int) return Interfaces.C.int; pragma Import (C, fl_overlay_window_handle, "fl_overlay_window_handle"); @@ -106,10 +105,10 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is procedure Draw_Overlay_Hook - (U : in System.Address) + (U : in Storage.Integer_Address) is Overlay_Widget : access Overlay_Window'Class := - Over_Convert.To_Pointer (U); + Over_Convert.To_Pointer (Storage.To_Address (U)); begin Overlay_Widget.Draw_Overlay; end Draw_Overlay_Hook; @@ -120,12 +119,12 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is procedure Finalize (This : in out Overlay_Window) is begin - if This.Void_Ptr /= System.Null_Address and then + if This.Void_Ptr /= Null_Pointer and then This in Overlay_Window'Class then This.Clear; free_fl_overlay_window (This.Void_Ptr); - This.Void_Ptr := System.Null_Address; + This.Void_Ptr := Null_Pointer; end if; Finalize (Double_Window (This)); end Finalize; @@ -154,10 +153,13 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - overlay_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - overlay_window_set_draw_overlay_hook (This.Void_Ptr, Draw_Overlay_Hook'Address); - overlay_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + overlay_window_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + overlay_window_set_draw_overlay_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Overlay_Hook'Address)); + overlay_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; @@ -176,10 +178,13 @@ package body FLTK.Widgets.Groups.Windows.Double.Overlay is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - overlay_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - overlay_window_set_draw_overlay_hook (This.Void_Ptr, Draw_Overlay_Hook'Address); - overlay_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + overlay_window_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + overlay_window_set_draw_overlay_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Overlay_Hook'Address)); + overlay_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; -- cgit