diff options
Diffstat (limited to 'src/fltk-widgets-groups-windows-single.adb')
| -rw-r--r-- | src/fltk-widgets-groups-windows-single.adb | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/src/fltk-widgets-groups-windows-single.adb b/src/fltk-widgets-groups-windows-single.adb index 2bc5608..2930933 100644 --- a/src/fltk-widgets-groups-windows-single.adb +++ b/src/fltk-widgets-groups-windows-single.adb @@ -2,24 +2,19 @@ with - Interfaces.C, - System; - -use type - - System.Address; + Interfaces.C; package body FLTK.Widgets.Groups.Windows.Single is procedure single_window_set_draw_hook - (W, D : in System.Address); + (W, D : in Storage.Integer_Address); pragma Import (C, single_window_set_draw_hook, "single_window_set_draw_hook"); pragma Inline (single_window_set_draw_hook); procedure single_window_set_handle_hook - (W, H : in System.Address); + (W, H : in Storage.Integer_Address); pragma Import (C, single_window_set_handle_hook, "single_window_set_handle_hook"); pragma Inline (single_window_set_handle_hook); @@ -29,19 +24,19 @@ package body FLTK.Widgets.Groups.Windows.Single is function new_fl_single_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_single_window, "new_fl_single_window"); pragma Inline (new_fl_single_window); function new_fl_single_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_single_window2, "new_fl_single_window2"); pragma Inline (new_fl_single_window2); procedure free_fl_single_window - (S : in System.Address); + (S : in Storage.Integer_Address); pragma Import (C, free_fl_single_window, "free_fl_single_window"); pragma Inline (free_fl_single_window); @@ -49,12 +44,12 @@ package body FLTK.Widgets.Groups.Windows.Single is procedure fl_single_window_show - (S : in System.Address); + (S : in Storage.Integer_Address); pragma Import (C, fl_single_window_show, "fl_single_window_show"); pragma Inline (fl_single_window_show); procedure fl_single_window_flush - (S : in System.Address); + (S : in Storage.Integer_Address); pragma Import (C, fl_single_window_flush, "fl_single_window_flush"); pragma Inline (fl_single_window_flush); @@ -62,12 +57,12 @@ package body FLTK.Widgets.Groups.Windows.Single is procedure fl_single_window_draw - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_single_window_draw, "fl_single_window_draw"); pragma Inline (fl_single_window_draw); function fl_single_window_handle - (W : in System.Address; + (W : in Storage.Integer_Address; E : in Interfaces.C.int) return Interfaces.C.int; pragma Import (C, fl_single_window_handle, "fl_single_window_handle"); @@ -79,12 +74,12 @@ package body FLTK.Widgets.Groups.Windows.Single is procedure Finalize (This : in out Single_Window) is begin - if This.Void_Ptr /= System.Null_Address and then + if This.Void_Ptr /= Null_Pointer and then This in Single_Window'Class then This.Clear; free_fl_single_window (This.Void_Ptr); - This.Void_Ptr := System.Null_Address; + This.Void_Ptr := Null_Pointer; end if; Finalize (Window (This)); end Finalize; @@ -109,9 +104,11 @@ package body FLTK.Widgets.Groups.Windows.Single is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - single_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - single_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + single_window_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + single_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; @@ -130,9 +127,11 @@ package body FLTK.Widgets.Groups.Windows.Single is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - single_window_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - single_window_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + single_window_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + single_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; |