diff options
Diffstat (limited to 'src/fltk-widgets-clocks.adb')
| -rw-r--r-- | src/fltk-widgets-clocks.adb | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/src/fltk-widgets-clocks.adb b/src/fltk-widgets-clocks.adb index a3cb315..b632336 100644 --- a/src/fltk-widgets-clocks.adb +++ b/src/fltk-widgets-clocks.adb @@ -12,18 +12,9 @@ with package body FLTK.Widgets.Clocks is - procedure clock_output_set_draw_hook - (W, D : in Storage.Integer_Address); - pragma Import (C, clock_output_set_draw_hook, "clock_output_set_draw_hook"); - pragma Inline (clock_output_set_draw_hook); - - procedure clock_output_set_handle_hook - (W, H : in Storage.Integer_Address); - pragma Import (C, clock_output_set_handle_hook, "clock_output_set_handle_hook"); - pragma Inline (clock_output_set_handle_hook); - - - + ------------------------ + -- Functions From C -- + ------------------------ function new_fl_clock_output (X, Y, W, H : in Interfaces.C.int; @@ -103,6 +94,10 @@ package body FLTK.Widgets.Clocks is + ------------------- + -- Destructors -- + ------------------- + procedure Extra_Final (This : in out Clock) is begin @@ -123,6 +118,10 @@ package body FLTK.Widgets.Clocks is + -------------------- + -- Constructors -- + -------------------- + procedure Extra_Init (This : in out Clock; X, Y, W, H : in Integer; @@ -132,6 +131,14 @@ package body FLTK.Widgets.Clocks is end Extra_Init; + procedure Initialize + (This : in out Clock) is + begin + This.Draw_Ptr := fl_clock_output_draw'Address; + This.Handle_Ptr := fl_clock_output_handle'Address; + end Initialize; + + package body Forge is function Create @@ -147,10 +154,6 @@ package body FLTK.Widgets.Clocks is Interfaces.C.int (H), Interfaces.C.To_C (Text)); Extra_Init (This, X, Y, W, H, Text); - clock_output_set_draw_hook - (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); - clock_output_set_handle_hook - (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address)); end return; end Create; @@ -159,6 +162,10 @@ package body FLTK.Widgets.Clocks is + ----------------------- + -- API Subprograms -- + ----------------------- + function Get_Hour (This : in Clock) return Hour is @@ -220,7 +227,7 @@ package body FLTK.Widgets.Clocks is procedure Draw (This : in out Clock) is begin - fl_clock_output_draw (This.Void_Ptr); + Widget (This).Draw; end Draw; @@ -237,15 +244,6 @@ package body FLTK.Widgets.Clocks is end Draw; - function Handle - (This : in out Clock; - Event : in Event_Kind) - return Event_Outcome is - begin - return Event_Outcome'Val - (fl_clock_output_handle (This.Void_Ptr, Event_Kind'Pos (Event))); - end Handle; - - end FLTK.Widgets.Clocks; + |