Changed System.Address to Integer_Address

1 files changed, 22 insertions, 24 deletions

diff --git a/src/fltk-devices-surfaces-paged.adb b/src/fltk-devices-surfaces-paged.adb
index c615078..df7dbca 100644
--- a/src/fltk-devices-surfaces-paged.adb
+++ b/src/fltk-devices-surfaces-paged.adb
@@ -2,25 +2,23 @@
 
 with
 
-    Interfaces.C,
-    System;
+    Interfaces.C;
 
 use type
 
-    Interfaces.C.int,
-    System.Address;
+    Interfaces.C.int;
 
 
 package body FLTK.Devices.Surfaces.Paged is
 
 
     function new_fl_paged_device
-        return System.Address;
+        return Storage.Integer_Address;
     pragma Import (C, new_fl_paged_device, "new_fl_paged_device");
     pragma Inline (new_fl_paged_device);
 
     procedure free_fl_paged_device
-           (D : in System.Address);
+           (D : in Storage.Integer_Address);
     pragma Import (C, free_fl_paged_device, "free_fl_paged_device");
     pragma Inline (free_fl_paged_device);
 
@@ -28,32 +26,32 @@ package body FLTK.Devices.Surfaces.Paged is
 
 
     function fl_paged_device_start_job
-           (D : in System.Address;
+           (D : in Storage.Integer_Address;
             C : in Interfaces.C.int)
         return Interfaces.C.int;
     pragma Import (C, fl_paged_device_start_job, "fl_paged_device_start_job");
     pragma Inline (fl_paged_device_start_job);
 
     function fl_paged_device_start_job2
-           (D       : in System.Address;
+           (D       : in Storage.Integer_Address;
             C, F, T : in Interfaces.C.int)
         return Interfaces.C.int;
     pragma Import (C, fl_paged_device_start_job2, "fl_paged_device_start_job2");
     pragma Inline (fl_paged_device_start_job2);
 
     procedure fl_paged_device_end_job
-           (D : in System.Address);
+           (D : in Storage.Integer_Address);
     pragma Import (C, fl_paged_device_end_job, "fl_paged_device_end_job");
     pragma Inline (fl_paged_device_end_job);
 
     function fl_paged_device_start_page
-           (D : in System.Address)
+           (D : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_paged_device_start_page, "fl_paged_device_start_page");
     pragma Inline (fl_paged_device_start_page);
 
     function fl_paged_device_end_page
-           (D : in System.Address)
+           (D : in Storage.Integer_Address)
         return Interfaces.C.int;
     pragma Import (C, fl_paged_device_end_page, "fl_paged_device_end_page");
     pragma Inline (fl_paged_device_end_page);
@@ -62,50 +60,50 @@ package body FLTK.Devices.Surfaces.Paged is
 
 
     procedure fl_paged_device_margins
-           (D          : in     System.Address;
+           (D          : in     Storage.Integer_Address;
             L, T, R, B :    out Interfaces.C.int);
     pragma Import (C, fl_paged_device_margins, "fl_paged_device_margins");
     pragma Inline (fl_paged_device_margins);
 
     function fl_paged_device_printable_rect
-           (D    : in     System.Address;
+           (D    : in     Storage.Integer_Address;
             W, H :    out Interfaces.C.int)
         return Interfaces.C.int;
     pragma Import (C, fl_paged_device_printable_rect, "fl_paged_device_printable_rect");
     pragma Inline (fl_paged_device_printable_rect);
 
     procedure fl_paged_device_get_origin
-           (D    : in     System.Address;
+           (D    : in     Storage.Integer_Address;
             X, Y :    out Interfaces.C.int);
     pragma Import (C, fl_paged_device_get_origin, "fl_paged_device_get_origin");
     pragma Inline (fl_paged_device_get_origin);
 
     procedure fl_paged_device_set_origin
-           (D    : in System.Address;
+           (D    : in Storage.Integer_Address;
             X, Y : in Interfaces.C.int);
     pragma Import (C, fl_paged_device_set_origin, "fl_paged_device_set_origin");
     pragma Inline (fl_paged_device_set_origin);
 
     procedure fl_paged_device_rotate
-           (D : in System.Address;
+           (D : in Storage.Integer_Address;
             R : in Interfaces.C.C_float);
     pragma Import (C, fl_paged_device_rotate, "fl_paged_device_rotate");
     pragma Inline (fl_paged_device_rotate);
 
     procedure fl_paged_device_scale
-           (D    : in System.Address;
+           (D    : in Storage.Integer_Address;
             X, Y : in Interfaces.C.C_float);
     pragma Import (C, fl_paged_device_scale, "fl_paged_device_scale");
     pragma Inline (fl_paged_device_scale);
 
     procedure fl_paged_device_translate
-           (D    : in System.Address;
+           (D    : in Storage.Integer_Address;
             X, Y : in Interfaces.C.int);
     pragma Import (C, fl_paged_device_translate, "fl_paged_device_translate");
     pragma Inline (fl_paged_device_translate);
 
     procedure fl_paged_device_untranslate
-           (D : in System.Address);
+           (D : in Storage.Integer_Address);
     pragma Import (C, fl_paged_device_untranslate, "fl_paged_device_untranslate");
     pragma Inline (fl_paged_device_untranslate);
 
@@ -113,19 +111,19 @@ package body FLTK.Devices.Surfaces.Paged is
 
 
     procedure fl_paged_device_print_widget
-           (D, I   : in System.Address;
+           (D, I   : in Storage.Integer_Address;
             DX, DY : in Interfaces.C.int);
     pragma Import (C, fl_paged_device_print_widget, "fl_paged_device_print_widget");
     pragma Inline (fl_paged_device_print_widget);
 
     procedure fl_paged_device_print_window
-           (D, I   : in System.Address;
+           (D, I   : in Storage.Integer_Address;
             DX, DY : in Interfaces.C.int);
     pragma Import (C, fl_paged_device_print_window, "fl_paged_device_print_window");
     pragma Inline (fl_paged_device_print_window);
 
     procedure fl_paged_device_print_window_part
-           (D, I               : in System.Address;
+           (D, I               : in Storage.Integer_Address;
             X, Y, W, H, DX, DY : in Interfaces.C.int);
     pragma Import (C, fl_paged_device_print_window_part, "fl_paged_device_print_window_part");
     pragma Inline (fl_paged_device_print_window_part);
@@ -136,11 +134,11 @@ package body FLTK.Devices.Surfaces.Paged is
     procedure Finalize
            (This : in out Paged_Surface) is
     begin
-        if  This.Void_Ptr /= System.Null_Address and then
+        if  This.Void_Ptr /= Null_Pointer and then
             This in Paged_Surface'Class
         then
             free_fl_paged_device (This.Void_Ptr);
-            This.Void_Ptr := System.Null_Address;
+            This.Void_Ptr := Null_Pointer;
         end if;
         Finalize (Surface_Device (This));
     end Finalize;