1 files changed, 23 insertions, 24 deletions

diff --git a/src/fltk-widgets-groups-windows-double.adb b/src/fltk-widgets-groups-windows-double.adb
index cc920d9..70f05fe 100644
--- a/src/fltk-widgets-groups-windows-double.adb
+++ b/src/fltk-widgets-groups-windows-double.adb
@@ -2,24 +2,19 @@
 
 with
 
-    Interfaces.C,
-    System;
-
-use type
-
-    System.Address;
+    Interfaces.C;
 
 
 package body FLTK.Widgets.Groups.Windows.Double is
 
 
     procedure double_window_set_draw_hook
-           (W, D : in System.Address);
+           (W, D : in Storage.Integer_Address);
     pragma Import (C, double_window_set_draw_hook, "double_window_set_draw_hook");
     pragma Inline (double_window_set_draw_hook);
 
     procedure double_window_set_handle_hook
-           (W, H : in System.Address);
+           (W, H : in Storage.Integer_Address);
     pragma Import (C, double_window_set_handle_hook, "double_window_set_handle_hook");
     pragma Inline (double_window_set_handle_hook);
 
@@ -29,19 +24,19 @@ package body FLTK.Widgets.Groups.Windows.Double is
     function new_fl_double_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_double_window, "new_fl_double_window");
     pragma Inline (new_fl_double_window);
 
     function new_fl_double_window2
            (X, Y : in Interfaces.C.int;
             Text : in Interfaces.C.char_array)
-        return System.Address;
+        return Storage.Integer_Address;
     pragma Import (C, new_fl_double_window2, "new_fl_double_window2");
     pragma Inline (new_fl_double_window2);
 
     procedure free_fl_double_window
-            (W : in System.Address);
+            (W : in Storage.Integer_Address);
     pragma Import (C, free_fl_double_window, "free_fl_double_window");
     pragma Inline (free_fl_double_window);
 
@@ -49,17 +44,17 @@ package body FLTK.Widgets.Groups.Windows.Double is
 
 
     procedure fl_double_window_show
-            (W : in System.Address);
+            (W : in Storage.Integer_Address);
     pragma Import (C, fl_double_window_show, "fl_double_window_show");
     pragma Inline (fl_double_window_show);
 
     procedure fl_double_window_hide
-            (W : in System.Address);
+            (W : in Storage.Integer_Address);
     pragma Import (C, fl_double_window_hide, "fl_double_window_hide");
     pragma Inline (fl_double_window_hide);
 
     procedure fl_double_window_flush
-            (W : in System.Address);
+            (W : in Storage.Integer_Address);
     pragma Import (C, fl_double_window_flush, "fl_double_window_flush");
     pragma Inline (fl_double_window_flush);
 
@@ -67,12 +62,12 @@ package body FLTK.Widgets.Groups.Windows.Double is
 
 
     procedure fl_double_window_draw
-           (W : in System.Address);
+           (W : in Storage.Integer_Address);
     pragma Import (C, fl_double_window_draw, "fl_double_window_draw");
     pragma Inline (fl_double_window_draw);
 
     function fl_double_window_handle
-           (W : in System.Address;
+           (W : in Storage.Integer_Address;
             E : in Interfaces.C.int)
         return Interfaces.C.int;
     pragma Import (C, fl_double_window_handle, "fl_double_window_handle");
@@ -84,12 +79,12 @@ package body FLTK.Widgets.Groups.Windows.Double is
     procedure Finalize
            (This : in out Double_Window) is
     begin
-        if  This.Void_Ptr /= System.Null_Address and then
+        if  This.Void_Ptr /= Null_Pointer and then
             This in Double_Window'Class
         then
             This.Clear;
             free_fl_double_window (This.Void_Ptr);
-            This.Void_Ptr := System.Null_Address;
+            This.Void_Ptr := Null_Pointer;
         end if;
         Finalize (Window (This));
     end Finalize;
@@ -114,9 +109,11 @@ package body FLTK.Widgets.Groups.Windows.Double is
                 fl_group_end (This.Void_Ptr);
                 fl_widget_set_user_data
                        (This.Void_Ptr,
-                        Widget_Convert.To_Address (This'Unchecked_Access));
-                double_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
-                double_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+                        Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access)));
+                double_window_set_draw_hook
+                    (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
+                double_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;
@@ -135,9 +132,11 @@ package body FLTK.Widgets.Groups.Windows.Double is
                 fl_group_end (This.Void_Ptr);
                 fl_widget_set_user_data
                        (This.Void_Ptr,
-                        Widget_Convert.To_Address (This'Unchecked_Access));
-                double_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
-                double_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+                        Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access)));
+                double_window_set_draw_hook
+                    (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address));
+                double_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;