diff options
Diffstat (limited to 'src/fltk-widgets-valuators-counters-simple.adb')
| -rw-r--r-- | src/fltk-widgets-valuators-counters-simple.adb | 55 |
1 files changed, 20 insertions, 35 deletions
diff --git a/src/fltk-widgets-valuators-counters-simple.adb b/src/fltk-widgets-valuators-counters-simple.adb index d811722..294a076 100644 --- a/src/fltk-widgets-valuators-counters-simple.adb +++ b/src/fltk-widgets-valuators-counters-simple.adb @@ -12,18 +12,9 @@ with package body FLTK.Widgets.Valuators.Counters.Simple is - procedure simple_counter_set_draw_hook - (W, D : in Storage.Integer_Address); - pragma Import (C, simple_counter_set_draw_hook, "simple_counter_set_draw_hook"); - pragma Inline (simple_counter_set_draw_hook); - - procedure simple_counter_set_handle_hook - (W, H : in Storage.Integer_Address); - pragma Import (C, simple_counter_set_handle_hook, "simple_counter_set_handle_hook"); - pragma Inline (simple_counter_set_handle_hook); - - - + ------------------------ + -- Functions From C -- + ------------------------ function new_fl_simple_counter (X, Y, W, H : in Interfaces.C.int; @@ -55,6 +46,10 @@ package body FLTK.Widgets.Valuators.Counters.Simple is + ------------------- + -- Destructors -- + ------------------- + procedure Extra_Final (This : in out Simple_Counter) is begin @@ -75,6 +70,10 @@ package body FLTK.Widgets.Valuators.Counters.Simple is + -------------------- + -- Constructors -- + -------------------- + procedure Extra_Init (This : in out Simple_Counter; X, Y, W, H : in Integer; @@ -84,6 +83,14 @@ package body FLTK.Widgets.Valuators.Counters.Simple is end Extra_Init; + procedure Initialize + (This : in out Simple_Counter) is + begin + This.Draw_Ptr := fl_simple_counter_draw'Address; + This.Handle_Ptr := fl_simple_counter_handle'Address; + end Initialize; + + package body Forge is function Create @@ -99,34 +106,12 @@ package body FLTK.Widgets.Valuators.Counters.Simple is Interfaces.C.int (H), Interfaces.C.To_C (Text)); Extra_Init (This, X, Y, W, H, Text); - simple_counter_set_draw_hook - (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); - simple_counter_set_handle_hook - (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address)); end return; end Create; end Forge; - - - procedure Draw - (This : in out Simple_Counter) is - begin - fl_simple_counter_draw (This.Void_Ptr); - end Draw; - - - function Handle - (This : in out Simple_Counter; - Event : in Event_Kind) - return Event_Outcome is - begin - return Event_Outcome'Val - (fl_simple_counter_handle (This.Void_Ptr, Event_Kind'Pos (Event))); - end Handle; - - end FLTK.Widgets.Valuators.Counters.Simple; + |