diff options
| author | Jed Barber <jjbarber@y7mail.com> | 2016-11-11 10:53:05 +1100 |
|---|---|---|
| committer | Jed Barber <jjbarber@y7mail.com> | 2016-11-11 10:53:05 +1100 |
| commit | cb8ade55fb2f85951e53706de277261b726ecad7 (patch) | |
| tree | 75d00ddf6bed9696165ebf144f31cc65064d73c1 /fltk-widgets.ads | |
| parent | bee437918713d9fc2213a5a554ac02f4e7af3249 (diff) | |
Simplified widget callbacks
Diffstat (limited to 'fltk-widgets.ads')
| -rw-r--r-- | fltk-widgets.ads | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fltk-widgets.ads b/fltk-widgets.ads index 7af5e2b..d1c4b89 100644 --- a/fltk-widgets.ads +++ b/fltk-widgets.ads @@ -5,6 +5,7 @@ with FLTK.Images; limited with FLTK.Widgets.Groups; private with System; private with System.Address_To_Access_Conversions; +private with Ada.Unchecked_Conversion; package FLTK.Widgets is @@ -13,10 +14,8 @@ package FLTK.Widgets is type Widget is abstract new Wrapper with private; - type Widget_Callback is interface; - procedure Call - (This : in Widget_Callback; - Item : in out Widget'Class) is abstract; + type Widget_Callback is access procedure + (Item : in out Widget'Class); type Font_Size is new Natural; @@ -87,7 +86,7 @@ package FLTK.Widgets is procedure Set_Callback (This : in out Widget; - Func : not null access Widget_Callback'Class); + Func : in Widget_Callback); function Get_X @@ -135,13 +134,17 @@ private type Widget is abstract new Wrapper with record - Callback : access Widget_Callback'Class; + Callback : Widget_Callback; Current_Image : access FLTK.Images.Image'Class; end record; package Widget_Convert is new System.Address_To_Access_Conversions (Widget'Class); - package Callback_Convert is new System.Address_To_Access_Conversions (Widget_Callback'Class); + -- package Callback_Convert is new System.Address_To_Access_Conversions (Widget_Callback); + package Callback_Convert is + function To_Pointer is new Ada.Unchecked_Conversion (System.Address, Widget_Callback); + function To_Address is new Ada.Unchecked_Conversion (Widget_Callback, System.Address); + end Callback_Convert; function fl_widget_get_user_data |