diff options
Diffstat (limited to 'src/fltk-widgets-valuators-rollers.adb')
| -rw-r--r-- | src/fltk-widgets-valuators-rollers.adb | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/src/fltk-widgets-valuators-rollers.adb b/src/fltk-widgets-valuators-rollers.adb index 520a816..a3966e5 100644 --- a/src/fltk-widgets-valuators-rollers.adb +++ b/src/fltk-widgets-valuators-rollers.adb @@ -12,18 +12,9 @@ with package body FLTK.Widgets.Valuators.Rollers is - procedure roller_set_draw_hook - (W, D : in Storage.Integer_Address); - pragma Import (C, roller_set_draw_hook, "roller_set_draw_hook"); - pragma Inline (roller_set_draw_hook); - - procedure roller_set_handle_hook - (W, H : in Storage.Integer_Address); - pragma Import (C, roller_set_handle_hook, "roller_set_handle_hook"); - pragma Inline (roller_set_handle_hook); - - - + ------------------------ + -- Functions From C -- + ------------------------ function new_fl_roller (X, Y, W, H : in Interfaces.C.int; @@ -55,6 +46,10 @@ package body FLTK.Widgets.Valuators.Rollers is + ------------------- + -- Destructors -- + ------------------- + procedure Extra_Final (This : in out Roller) is begin @@ -75,6 +70,10 @@ package body FLTK.Widgets.Valuators.Rollers is + -------------------- + -- Constructors -- + -------------------- + procedure Extra_Init (This : in out Roller; X, Y, W, H : in Integer; @@ -84,6 +83,14 @@ package body FLTK.Widgets.Valuators.Rollers is end Extra_Init; + procedure Initialize + (This : in out Roller) is + begin + This.Draw_Ptr := fl_roller_draw'Address; + This.Handle_Ptr := fl_roller_handle'Address; + end Initialize; + + package body Forge is function Create @@ -99,8 +106,6 @@ package body FLTK.Widgets.Valuators.Rollers is Interfaces.C.int (H), Interfaces.C.To_C (Text)); Extra_Init (This, X, Y, W, H, Text); - roller_set_draw_hook (This.Void_Ptr, Storage.To_Integer (Draw_Hook'Address)); - roller_set_handle_hook (This.Void_Ptr, Storage.To_Integer (Handle_Hook'Address)); end return; end Create; @@ -109,10 +114,14 @@ package body FLTK.Widgets.Valuators.Rollers is + ----------------------- + -- API Subprograms -- + ----------------------- + procedure Draw (This : in out Roller) is begin - fl_roller_draw (This.Void_Ptr); + Valuator (This).Draw; end Draw; @@ -121,10 +130,10 @@ package body FLTK.Widgets.Valuators.Rollers is Event : in Event_Kind) return Event_Outcome is begin - return Event_Outcome'Val - (fl_roller_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + return Valuator (This).Handle (Event); end Handle; end FLTK.Widgets.Valuators.Rollers; + |