From d3b6a05cf266af9d426e9756a1b2deafdbca35fe Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Tue, 9 May 2017 13:52:31 +1000 Subject: Changed Integer_Input package name --- src/fltk-widgets-inputs-int.adb | 111 ------------------------------------ src/fltk-widgets-inputs-int.ads | 35 ------------ src/fltk-widgets-inputs-integer.adb | 111 ++++++++++++++++++++++++++++++++++++ src/fltk-widgets-inputs-integer.ads | 35 ++++++++++++ 4 files changed, 146 insertions(+), 146 deletions(-) delete mode 100644 src/fltk-widgets-inputs-int.adb delete mode 100644 src/fltk-widgets-inputs-int.ads create mode 100644 src/fltk-widgets-inputs-integer.adb create mode 100644 src/fltk-widgets-inputs-integer.ads diff --git a/src/fltk-widgets-inputs-int.adb b/src/fltk-widgets-inputs-int.adb deleted file mode 100644 index 1b73c6a..0000000 --- a/src/fltk-widgets-inputs-int.adb +++ /dev/null @@ -1,111 +0,0 @@ - - -with Interfaces.C.Strings; -with System; -use type System.Address; - - -package body FLTK.Widgets.Inputs.Int is - - - procedure int_input_set_draw_hook - (W, D : in System.Address); - pragma Import (C, int_input_set_draw_hook, "int_input_set_draw_hook"); - - procedure fl_int_input_draw - (W : in System.Address); - pragma Import (C, fl_int_input_draw, "fl_int_input_draw"); - - function new_fl_int_input - (X, Y, W, H : in Interfaces.C.int; - Text : in Interfaces.C.char_array) - return System.Address; - pragma Import (C, new_fl_int_input, "new_fl_int_input"); - - procedure free_fl_int_input - (F : in System.Address); - pragma Import (C, free_fl_int_input, "free_fl_int_input"); - - function fl_int_input_get_value - (F : in System.Address) - return Interfaces.C.Strings.chars_ptr; - pragma Import (C, fl_int_input_get_value, "fl_int_input_get_value"); - - - - - procedure Draw_Hook (U : in System.Address); - pragma Convention (C, Draw_Hook); - - procedure Draw_Hook - (U : in System.Address) - is - package Integer_Input_Convert is new - System.Address_To_Access_Conversions (Integer_Input'Class); - - Ada_Input : access Integer_Input'Class := - Integer_Input_Convert.To_Pointer (U); - begin - Ada_Input.Draw; - end Draw_Hook; - - - - - procedure Draw - (This : in out Integer_Input) is - begin - fl_int_input_draw (This.Void_Ptr); - end Draw; - - - - - procedure Finalize - (This : in out Integer_Input) is - begin - if This in Integer_Input and then - This.Void_Ptr /= System.Null_Address - then - free_fl_int_input (This.Void_Ptr); - end if; - Finalize (Input (This)); - end Finalize; - - - - - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Integer_Input is - begin - return This : Integer_Input do - This.Void_Ptr := new_fl_int_input - (Interfaces.C.int (X), - Interfaces.C.int (Y), - Interfaces.C.int (W), - Interfaces.C.int (H), - Interfaces.C.To_C (Text)); - fl_widget_set_user_data - (This.Void_Ptr, - Widget_Convert.To_Address (This'Unchecked_Access)); - int_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - end return; - end Create; - - - - - function Get_Value - (This : in Integer_Input) - return Integer is - begin - return Integer'Value - (Interfaces.C.Strings.Value - (fl_int_input_get_value (This.Void_Ptr))); - end Get_Value; - - -end FLTK.Widgets.Inputs.Int; - diff --git a/src/fltk-widgets-inputs-int.ads b/src/fltk-widgets-inputs-int.ads deleted file mode 100644 index e8d1184..0000000 --- a/src/fltk-widgets-inputs-int.ads +++ /dev/null @@ -1,35 +0,0 @@ - - -package FLTK.Widgets.Inputs.Int is - - - type Integer_Input is new Input with private; - - - function Create - (X, Y, W, H : in Integer; - Text : in String) - return Integer_Input; - - - function Get_Value - (This : in Integer_Input) - return Integer; - - - procedure Draw - (This : in out Integer_Input); - - -private - - - type Integer_Input is new Input with null record; - - - overriding procedure Finalize - (This : in out Integer_Input); - - -end FLTK.Widgets.Inputs.Int; - diff --git a/src/fltk-widgets-inputs-integer.adb b/src/fltk-widgets-inputs-integer.adb new file mode 100644 index 0000000..0f2c711 --- /dev/null +++ b/src/fltk-widgets-inputs-integer.adb @@ -0,0 +1,111 @@ + + +with Interfaces.C.Strings; +with System; +use type System.Address; + + +package body FLTK.Widgets.Inputs.Integer is + + + procedure int_input_set_draw_hook + (W, D : in System.Address); + pragma Import (C, int_input_set_draw_hook, "int_input_set_draw_hook"); + + procedure fl_int_input_draw + (W : in System.Address); + pragma Import (C, fl_int_input_draw, "fl_int_input_draw"); + + function new_fl_int_input + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_int_input, "new_fl_int_input"); + + procedure free_fl_int_input + (F : in System.Address); + pragma Import (C, free_fl_int_input, "free_fl_int_input"); + + function fl_int_input_get_value + (F : in System.Address) + return Interfaces.C.Strings.chars_ptr; + pragma Import (C, fl_int_input_get_value, "fl_int_input_get_value"); + + + + + procedure Draw_Hook (U : in System.Address); + pragma Convention (C, Draw_Hook); + + procedure Draw_Hook + (U : in System.Address) + is + package Integer_Input_Convert is new + System.Address_To_Access_Conversions (Integer_Input'Class); + + Ada_Input : access Integer_Input'Class := + Integer_Input_Convert.To_Pointer (U); + begin + Ada_Input.Draw; + end Draw_Hook; + + + + + procedure Draw + (This : in out Integer_Input) is + begin + fl_int_input_draw (This.Void_Ptr); + end Draw; + + + + + procedure Finalize + (This : in out Integer_Input) is + begin + if This in Integer_Input and then + This.Void_Ptr /= System.Null_Address + then + free_fl_int_input (This.Void_Ptr); + end if; + Finalize (Input (This)); + end Finalize; + + + + + function Create + (X, Y, W, H : in Standard.Integer; + Text : in String) + return Integer_Input is + begin + return This : Integer_Input do + This.Void_Ptr := new_fl_int_input + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + int_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + end return; + end Create; + + + + + function Get_Value + (This : in Integer_Input) + return Standard.Integer is + begin + return Standard.Integer'Value + (Interfaces.C.Strings.Value + (fl_int_input_get_value (This.Void_Ptr))); + end Get_Value; + + +end FLTK.Widgets.Inputs.Integer; + diff --git a/src/fltk-widgets-inputs-integer.ads b/src/fltk-widgets-inputs-integer.ads new file mode 100644 index 0000000..4699028 --- /dev/null +++ b/src/fltk-widgets-inputs-integer.ads @@ -0,0 +1,35 @@ + + +package FLTK.Widgets.Inputs.Integer is + + + type Integer_Input is new Input with private; + + + function Create + (X, Y, W, H : in Standard.Integer; + Text : in String) + return Integer_Input; + + + function Get_Value + (This : in Integer_Input) + return Standard.Integer; + + + procedure Draw + (This : in out Integer_Input); + + +private + + + type Integer_Input is new Input with null record; + + + overriding procedure Finalize + (This : in out Integer_Input); + + +end FLTK.Widgets.Inputs.Integer; + -- cgit