From 38e5d2200b48b86772d6921e1553bf76408e5809 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Thu, 1 Mar 2018 19:45:07 +1100 Subject: Corrected C naming terminology for Fl_Clock_Output --- src/fltk-widgets-clocks.adb | 72 ++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/fltk-widgets-clocks.adb') diff --git a/src/fltk-widgets-clocks.adb b/src/fltk-widgets-clocks.adb index da53d11..f409af5 100644 --- a/src/fltk-widgets-clocks.adb +++ b/src/fltk-widgets-clocks.adb @@ -13,75 +13,75 @@ use type package body FLTK.Widgets.Clocks is - procedure clock_set_draw_hook + procedure clock_output_set_draw_hook (W, D : in System.Address); - pragma Import (C, clock_set_draw_hook, "clock_set_draw_hook"); + pragma Import (C, clock_output_set_draw_hook, "clock_output_set_draw_hook"); - procedure clock_set_handle_hook + procedure clock_output_set_handle_hook (W, H : in System.Address); - pragma Import (C, clock_set_handle_hook, "clock_set_handle_hook"); + pragma Import (C, clock_output_set_handle_hook, "clock_output_set_handle_hook"); - function new_fl_clock + function new_fl_clock_output (X, Y, W, H : in Interfaces.C.int; Text : in Interfaces.C.char_array) return System.Address; - pragma Import (C, new_fl_clock, "new_fl_clock"); + pragma Import (C, new_fl_clock_output, "new_fl_clock_output"); - procedure free_fl_clock + procedure free_fl_clock_output (F : in System.Address); - pragma Import (C, free_fl_clock, "free_fl_clock"); + pragma Import (C, free_fl_clock_output, "free_fl_clock_output"); - function fl_clock_get_hour + function fl_clock_output_get_hour (C : in System.Address) return Interfaces.C.int; - pragma Import (C, fl_clock_get_hour, "fl_clock_get_hour"); + pragma Import (C, fl_clock_output_get_hour, "fl_clock_output_get_hour"); - function fl_clock_get_minute + function fl_clock_output_get_minute (C : in System.Address) return Interfaces.C.int; - pragma Import (C, fl_clock_get_minute, "fl_clock_get_minute"); + pragma Import (C, fl_clock_output_get_minute, "fl_clock_output_get_minute"); - function fl_clock_get_second + function fl_clock_output_get_second (C : in System.Address) return Interfaces.C.int; - pragma Import (C, fl_clock_get_second, "fl_clock_get_second"); + pragma Import (C, fl_clock_output_get_second, "fl_clock_output_get_second"); - function fl_clock_get_value + function fl_clock_output_get_value (C : in System.Address) return Interfaces.C.unsigned_long; - pragma Import (C, fl_clock_get_value, "fl_clock_get_value"); + pragma Import (C, fl_clock_output_get_value, "fl_clock_output_get_value"); - procedure fl_clock_set_value + procedure fl_clock_output_set_value (C : in System.Address; V : in Interfaces.C.unsigned_long); - pragma Import (C, fl_clock_set_value, "fl_clock_set_value"); + pragma Import (C, fl_clock_output_set_value, "fl_clock_output_set_value"); - procedure fl_clock_set_value2 + procedure fl_clock_output_set_value2 (C : in System.Address; H, M, S : in Interfaces.C.int); - pragma Import (C, fl_clock_set_value2, "fl_clock_set_value2"); + pragma Import (C, fl_clock_output_set_value2, "fl_clock_output_set_value2"); - procedure fl_clock_draw + procedure fl_clock_output_draw (W : in System.Address); - pragma Import (C, fl_clock_draw, "fl_clock_draw"); + pragma Import (C, fl_clock_output_draw, "fl_clock_output_draw"); - function fl_clock_handle + function fl_clock_output_handle (W : in System.Address; E : in Interfaces.C.int) return Interfaces.C.int; - pragma Import (C, fl_clock_handle, "fl_clock_handle"); + pragma Import (C, fl_clock_output_handle, "fl_clock_output_handle"); @@ -92,7 +92,7 @@ package body FLTK.Widgets.Clocks is if This.Void_Ptr /= System.Null_Address and then This in Clock'Class then - free_fl_clock (This.Void_Ptr); + free_fl_clock_output (This.Void_Ptr); This.Void_Ptr := System.Null_Address; end if; Finalize (Widget (This)); @@ -107,7 +107,7 @@ package body FLTK.Widgets.Clocks is return Clock is begin return This : Clock do - This.Void_Ptr := new_fl_clock + This.Void_Ptr := new_fl_clock_output (Interfaces.C.int (X), Interfaces.C.int (Y), Interfaces.C.int (W), @@ -116,8 +116,8 @@ package body FLTK.Widgets.Clocks is fl_widget_set_user_data (This.Void_Ptr, Widget_Convert.To_Address (This'Unchecked_Access)); - clock_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); - clock_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + clock_output_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + clock_output_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); end return; end Create; @@ -128,7 +128,7 @@ package body FLTK.Widgets.Clocks is (This : in Clock) return Hour is begin - return Hour (fl_clock_get_hour (This.Void_Ptr)); + return Hour (fl_clock_output_get_hour (This.Void_Ptr)); end Get_Hour; @@ -136,7 +136,7 @@ package body FLTK.Widgets.Clocks is (This : in Clock) return Minute is begin - return Minute (fl_clock_get_minute (This.Void_Ptr)); + return Minute (fl_clock_output_get_minute (This.Void_Ptr)); end Get_Minute; @@ -144,7 +144,7 @@ package body FLTK.Widgets.Clocks is (This : in Clock) return Second is begin - return Second (fl_clock_get_second (This.Void_Ptr)); + return Second (fl_clock_output_get_second (This.Void_Ptr)); end Get_Second; @@ -154,7 +154,7 @@ package body FLTK.Widgets.Clocks is (This : in Clock) return Time_Value is begin - return Time_Value (fl_clock_get_value (This.Void_Ptr)); + return Time_Value (fl_clock_output_get_value (This.Void_Ptr)); end Get_Time; @@ -162,7 +162,7 @@ package body FLTK.Widgets.Clocks is (This : in out Clock; To : in Time_Value) is begin - fl_clock_set_value (This.Void_Ptr, Interfaces.C.unsigned_long (To)); + fl_clock_output_set_value (This.Void_Ptr, Interfaces.C.unsigned_long (To)); end Set_Time; @@ -172,7 +172,7 @@ package body FLTK.Widgets.Clocks is Minutes : in Minute; Seconds : in Second) is begin - fl_clock_set_value2 + fl_clock_output_set_value2 (This.Void_Ptr, Interfaces.C.int (Hours), Interfaces.C.int (Minutes), @@ -185,7 +185,7 @@ package body FLTK.Widgets.Clocks is procedure Draw (This : in out Clock) is begin - fl_clock_draw (This.Void_Ptr); + fl_clock_output_draw (This.Void_Ptr); end Draw; @@ -195,7 +195,7 @@ package body FLTK.Widgets.Clocks is return Event_Outcome is begin return Event_Outcome'Val - (fl_clock_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + (fl_clock_output_handle (This.Void_Ptr, Event_Kind'Pos (Event))); end Handle; -- cgit