Changed System.Address to Integer_Address

1 files changed, 23 insertions, 23 deletions

diff --git a/src/fltk-widgets-valuators-value_outputs.adb b/src/fltk-widgets-valuators-value_outputs.adb
index 0c99ace..8d74434 100644
--- a/src/fltk-widgets-valuators-value_outputs.adb
+++ b/src/fltk-widgets-valuators-value_outputs.adb
@@ -2,25 +2,23 @@
 
 with
 
-    Interfaces.C.Strings,
-    System;
+    Interfaces.C.Strings;
 
 use type
 
-    Interfaces.C.int,
-    System.Address;
+    Interfaces.C.int;
 
 
 package body FLTK.Widgets.Valuators.Value_Outputs is
 
 
     procedure value_output_set_draw_hook
-           (W, D : in System.Address);
+           (W, D : in Storage.Integer_Address);
     pragma Import (C, value_output_set_draw_hook, "value_output_set_draw_hook");
     pragma Inline (value_output_set_draw_hook);
 
     procedure value_output_set_handle_hook
-           (W, H : in System.Address);
+           (W, H : in Storage.Integer_Address);
     pragma Import (C, value_output_set_handle_hook, "value_output_set_handle_hook");
     pragma Inline (value_output_set_handle_hook);
 
@@ -30,12 +28,12 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
     function new_fl_value_output
            (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_output, "new_fl_value_output");
     pragma Inline (new_fl_value_output);
 
     procedure free_fl_value_output
-           (A : in System.Address);
+           (A : in Storage.Integer_Address);
     pragma Import (C, free_fl_value_output, "free_fl_value_output");
     pragma Inline (free_fl_value_output);
 
@@ -43,13 +41,13 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
 
 
     function fl_value_output_is_soft
-           (A : in System.Address)
+           (A : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_value_output_is_soft, "fl_value_output_is_soft");
     pragma Inline (fl_value_output_is_soft);
 
     procedure fl_value_output_set_soft
-           (A : in System.Address;
+           (A : in Storage.Integer_Address;
             T : in Interfaces.C.int);
     pragma Import (C, fl_value_output_set_soft, "fl_value_output_set_soft");
     pragma Inline (fl_value_output_set_soft);
@@ -58,37 +56,37 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
 
 
     function fl_value_output_get_text_color
-           (TD : in System.Address)
+           (TD : in Storage.Integer_Address)
         return Interfaces.C.unsigned;
     pragma Import (C, fl_value_output_get_text_color, "fl_value_output_get_text_color");
     pragma Inline (fl_value_output_get_text_color);
 
     procedure fl_value_output_set_text_color
-           (TD : in System.Address;
+           (TD : in Storage.Integer_Address;
             C  : in Interfaces.C.unsigned);
     pragma Import (C, fl_value_output_set_text_color, "fl_value_output_set_text_color");
     pragma Inline (fl_value_output_set_text_color);
 
     function fl_value_output_get_text_font
-           (TD : in System.Address)
+           (TD : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_value_output_get_text_font, "fl_value_output_get_text_font");
     pragma Inline (fl_value_output_get_text_font);
 
     procedure fl_value_output_set_text_font
-           (TD : in System.Address;
+           (TD : in Storage.Integer_Address;
             F  : in Interfaces.C.int);
     pragma Import (C, fl_value_output_set_text_font, "fl_value_output_set_text_font");
     pragma Inline (fl_value_output_set_text_font);
 
     function fl_value_output_get_text_size
-           (TD : in System.Address)
+           (TD : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_value_output_get_text_size, "fl_value_output_get_text_size");
     pragma Inline (fl_value_output_get_text_size);
 
     procedure fl_value_output_set_text_size
-           (TD : in System.Address;
+           (TD : in Storage.Integer_Address;
             S  : in Interfaces.C.int);
     pragma Import (C, fl_value_output_set_text_size, "fl_value_output_set_text_size");
     pragma Inline (fl_value_output_set_text_size);
@@ -97,12 +95,12 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
 
 
     procedure fl_value_output_draw
-           (W : in System.Address);
+           (W : in Storage.Integer_Address);
     pragma Import (C, fl_value_output_draw, "fl_value_output_draw");
     pragma Inline (fl_value_output_draw);
 
     function fl_value_output_handle
-           (W : in System.Address;
+           (W : in Storage.Integer_Address;
             E : in Interfaces.C.int)
         return Interfaces.C.int;
     pragma Import (C, fl_value_output_handle, "fl_value_output_handle");
@@ -114,11 +112,11 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
     procedure Finalize
            (This : in out Value_Output) is
     begin
-        if  This.Void_Ptr /= System.Null_Address and then
+        if  This.Void_Ptr /= Null_Pointer and then
             This in Value_Output'Class
         then
             free_fl_value_output (This.Void_Ptr);
-            This.Void_Ptr := System.Null_Address;
+            This.Void_Ptr := Null_Pointer;
         end if;
         Finalize (Valuator (This));
     end Finalize;
@@ -142,9 +140,11 @@ package body FLTK.Widgets.Valuators.Value_Outputs is
                         Interfaces.C.To_C (Text));
                 fl_widget_set_user_data
                        (This.Void_Ptr,
-                        Widget_Convert.To_Address (This'Unchecked_Access));
-                value_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
-                value_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+                        Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access)));
+                value_output_set_draw_hook
+                    (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
+                value_output_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;