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-valuators-sliders-value.adb | 43 +++++++++++++--------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'src/fltk-widgets-valuators-sliders-value.adb') diff --git a/src/fltk-widgets-valuators-sliders-value.adb b/src/fltk-widgets-valuators-sliders-value.adb index 48cd603..d6ad35a 100644 --- a/src/fltk-widgets-valuators-sliders-value.adb +++ b/src/fltk-widgets-valuators-sliders-value.adb @@ -2,24 +2,19 @@ with - Interfaces.C.Strings, - System; - -use type - - System.Address; + Interfaces.C.Strings; package body FLTK.Widgets.Valuators.Sliders.Value is procedure value_slider_set_draw_hook - (W, D : in System.Address); + (W, D : in Storage.Integer_Address); pragma Import (C, value_slider_set_draw_hook, "value_slider_set_draw_hook"); pragma Inline (value_slider_set_draw_hook); procedure value_slider_set_handle_hook - (W, H : in System.Address); + (W, H : in Storage.Integer_Address); pragma Import (C, value_slider_set_handle_hook, "value_slider_set_handle_hook"); pragma Inline (value_slider_set_handle_hook); @@ -29,12 +24,12 @@ package body FLTK.Widgets.Valuators.Sliders.Value is function new_fl_value_slider (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_value_slider, "new_fl_value_slider"); pragma Inline (new_fl_value_slider); procedure free_fl_value_slider - (D : in System.Address); + (D : in Storage.Integer_Address); pragma Import (C, free_fl_value_slider, "free_fl_value_slider"); pragma Inline (free_fl_value_slider); @@ -42,37 +37,37 @@ package body FLTK.Widgets.Valuators.Sliders.Value is function fl_value_slider_get_textcolor - (S : in System.Address) + (S : in Storage.Integer_Address) return Interfaces.C.unsigned; pragma Import (C, fl_value_slider_get_textcolor, "fl_value_slider_get_textcolor"); pragma Inline (fl_value_slider_get_textcolor); procedure fl_value_slider_set_textcolor - (S : in System.Address; + (S : in Storage.Integer_Address; C : in Interfaces.C.unsigned); pragma Import (C, fl_value_slider_set_textcolor, "fl_value_slider_set_textcolor"); pragma Inline (fl_value_slider_set_textcolor); function fl_value_slider_get_textfont - (S : in System.Address) + (S : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_value_slider_get_textfont, "fl_value_slider_get_textfont"); pragma Inline (fl_value_slider_get_textfont); procedure fl_value_slider_set_textfont - (S : in System.Address; + (S : in Storage.Integer_Address; F : in Interfaces.C.int); pragma Import (C, fl_value_slider_set_textfont, "fl_value_slider_set_textfont"); pragma Inline (fl_value_slider_set_textfont); function fl_value_slider_get_textsize - (S : in System.Address) + (S : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_value_slider_get_textsize, "fl_value_slider_get_textsize"); pragma Inline (fl_value_slider_get_textsize); procedure fl_value_slider_set_textsize - (S : in System.Address; + (S : in Storage.Integer_Address; F : in Interfaces.C.int); pragma Import (C, fl_value_slider_set_textsize, "fl_value_slider_set_textsize"); pragma Inline (fl_value_slider_set_textsize); @@ -81,12 +76,12 @@ package body FLTK.Widgets.Valuators.Sliders.Value is procedure fl_value_slider_draw - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_value_slider_draw, "fl_value_slider_draw"); pragma Inline (fl_value_slider_draw); function fl_value_slider_handle - (W : in System.Address; + (W : in Storage.Integer_Address; E : in Interfaces.C.int) return Interfaces.C.int; pragma Import (C, fl_value_slider_handle, "fl_value_slider_handle"); @@ -98,11 +93,11 @@ package body FLTK.Widgets.Valuators.Sliders.Value is procedure Finalize (This : in out Value_Slider) is begin - if This.Void_Ptr /= System.Null_Address and then + if This.Void_Ptr /= Null_Pointer and then This in Value_Slider'Class then free_fl_value_slider (This.Void_Ptr); - This.Void_Ptr := System.Null_Address; + This.Void_Ptr := Null_Pointer; end if; Finalize (Slider (This)); end Finalize; @@ -126,9 +121,11 @@ package body FLTK.Widgets.Valuators.Sliders.Value is Interfaces.C.To_C (Text)); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - value_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - value_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + value_slider_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + value_slider_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