diff options
Diffstat (limited to 'src/fltk-widgets-groups-input_choices.adb')
| -rw-r--r-- | src/fltk-widgets-groups-input_choices.adb | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/fltk-widgets-groups-input_choices.adb b/src/fltk-widgets-groups-input_choices.adb index 2a7db68..92a1afe 100644 --- a/src/fltk-widgets-groups-input_choices.adb +++ b/src/fltk-widgets-groups-input_choices.adb @@ -3,26 +3,24 @@ with Ada.Unchecked_Deallocation, - Interfaces.C.Strings, - System; + Interfaces.C.Strings; use type Interfaces.C.int, - Interfaces.C.Strings.chars_ptr, - System.Address; + Interfaces.C.Strings.chars_ptr; package body FLTK.Widgets.Groups.Input_Choices is procedure input_choice_set_draw_hook - (W, D : in System.Address); + (W, D : in Storage.Integer_Address); pragma Import (C, input_choice_set_draw_hook, "input_choice_set_draw_hook"); pragma Inline (input_choice_set_draw_hook); procedure input_choice_set_handle_hook - (W, H : in System.Address); + (W, H : in Storage.Integer_Address); pragma Import (C, input_choice_set_handle_hook, "input_choice_set_handle_hook"); pragma Inline (input_choice_set_handle_hook); @@ -32,12 +30,12 @@ package body FLTK.Widgets.Groups.Input_Choices is function new_fl_input_choice (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_input_choice, "new_fl_input_choice"); pragma Inline (new_fl_input_choice); procedure free_fl_input_choice - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, free_fl_input_choice, "free_fl_input_choice"); pragma Inline (free_fl_input_choice); @@ -45,14 +43,14 @@ package body FLTK.Widgets.Groups.Input_Choices is function fl_input_choice_input - (N : in System.Address) - return System.Address; + (N : in Storage.Integer_Address) + return Storage.Integer_Address; pragma Import (C, fl_input_choice_input, "fl_input_choice_input"); pragma Inline (fl_input_choice_input); function fl_input_choice_menubutton - (N : in System.Address) - return System.Address; + (N : in Storage.Integer_Address) + return Storage.Integer_Address; pragma Import (C, fl_input_choice_menubutton, "fl_input_choice_menubutton"); pragma Inline (fl_input_choice_menubutton); @@ -60,7 +58,7 @@ package body FLTK.Widgets.Groups.Input_Choices is procedure fl_input_choice_clear - (N : in System.Address); + (N : in Storage.Integer_Address); pragma Import (C, fl_input_choice_clear, "fl_input_choice_clear"); pragma Inline (fl_input_choice_clear); @@ -68,83 +66,83 @@ package body FLTK.Widgets.Groups.Input_Choices is function fl_input_choice_changed - (N : in System.Address) + (N : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_input_choice_changed, "fl_input_choice_changed"); pragma Inline (fl_input_choice_changed); procedure fl_input_choice_clear_changed - (N : in System.Address); + (N : in Storage.Integer_Address); pragma Import (C, fl_input_choice_clear_changed, "fl_input_choice_clear_changed"); pragma Inline (fl_input_choice_clear_changed); procedure fl_input_choice_set_changed - (N : in System.Address); + (N : in Storage.Integer_Address); pragma Import (C, fl_input_choice_set_changed, "fl_input_choice_set_changed"); pragma Inline (fl_input_choice_set_changed); function fl_input_choice_get_down_box - (N : in System.Address) + (N : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_input_choice_get_down_box, "fl_input_choice_get_down_box"); pragma Inline (fl_input_choice_get_down_box); procedure fl_input_choice_set_down_box - (N : in System.Address; + (N : in Storage.Integer_Address; T : in Interfaces.C.int); pragma Import (C, fl_input_choice_set_down_box, "fl_input_choice_set_down_box"); pragma Inline (fl_input_choice_set_down_box); function fl_input_choice_get_textcolor - (N : in System.Address) + (N : in Storage.Integer_Address) return Interfaces.C.unsigned; pragma Import (C, fl_input_choice_get_textcolor, "fl_input_choice_get_textcolor"); pragma Inline (fl_input_choice_get_textcolor); procedure fl_input_choice_set_textcolor - (N : in System.Address; + (N : in Storage.Integer_Address; T : in Interfaces.C.unsigned); pragma Import (C, fl_input_choice_set_textcolor, "fl_input_choice_set_textcolor"); pragma Inline (fl_input_choice_set_textcolor); function fl_input_choice_get_textfont - (N : in System.Address) + (N : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_input_choice_get_textfont, "fl_input_choice_get_textfont"); pragma Inline (fl_input_choice_get_textfont); procedure fl_input_choice_set_textfont - (N : in System.Address; + (N : in Storage.Integer_Address; T : in Interfaces.C.int); pragma Import (C, fl_input_choice_set_textfont, "fl_input_choice_set_textfont"); pragma Inline (fl_input_choice_set_textfont); function fl_input_choice_get_textsize - (N : in System.Address) + (N : in Storage.Integer_Address) return Interfaces.C.int; pragma Import (C, fl_input_choice_get_textsize, "fl_input_choice_get_textsize"); pragma Inline (fl_input_choice_get_textsize); procedure fl_input_choice_set_textsize - (N : in System.Address; + (N : in Storage.Integer_Address; T : in Interfaces.C.int); pragma Import (C, fl_input_choice_set_textsize, "fl_input_choice_set_textsize"); pragma Inline (fl_input_choice_set_textsize); function fl_input_choice_get_value - (N : in System.Address) + (N : in Storage.Integer_Address) return Interfaces.C.Strings.chars_ptr; pragma Import (C, fl_input_choice_get_value, "fl_input_choice_get_value"); pragma Inline (fl_input_choice_get_value); procedure fl_input_choice_set_value - (N : in System.Address; + (N : in Storage.Integer_Address; T : in Interfaces.C.char_array); pragma Import (C, fl_input_choice_set_value, "fl_input_choice_set_value"); pragma Inline (fl_input_choice_set_value); procedure fl_input_choice_set_value2 - (N : in System.Address; + (N : in Storage.Integer_Address; T : in Interfaces.C.int); pragma Import (C, fl_input_choice_set_value2, "fl_input_choice_set_value2"); pragma Inline (fl_input_choice_set_value2); @@ -153,12 +151,12 @@ package body FLTK.Widgets.Groups.Input_Choices is procedure fl_input_choice_draw - (W : in System.Address); + (W : in Storage.Integer_Address); pragma Import (C, fl_input_choice_draw, "fl_input_choice_draw"); pragma Inline (fl_input_choice_draw); function fl_input_choice_handle - (W : in System.Address; + (W : in Storage.Integer_Address; E : in Interfaces.C.int) return Interfaces.C.int; pragma Import (C, fl_input_choice_handle, "fl_input_choice_handle"); @@ -178,14 +176,14 @@ package body FLTK.Widgets.Groups.Input_Choices is procedure Finalize (This : in out Input_Choice) is begin - if This.Void_Ptr /= System.Null_Address and then + if This.Void_Ptr /= Null_Pointer and then This in Input_Choice'Class then Group (This).Clear; free_fl_input_choice (This.Void_Ptr); Free (This.My_Input); Free (This.My_Menu_Button); - This.Void_Ptr := System.Null_Address; + This.Void_Ptr := Null_Pointer; end if; Finalize (Group (This)); end Finalize; @@ -210,9 +208,11 @@ package body FLTK.Widgets.Groups.Input_Choices is fl_group_end (This.Void_Ptr); fl_widget_set_user_data (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - input_choice_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - input_choice_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + Storage.To_Integer (Widget_Convert.To_Address (This'Unchecked_Access))); + input_choice_set_draw_hook + (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); + input_choice_set_handle_hook + (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address)); fl_widget_set_label (This.Void_Ptr, Interfaces.C.To_C (Text)); This.My_Input := new INP.Input; |