diff options
author | Jed Barber <jjbarber@y7mail.com> | 2017-05-14 13:33:27 +1000 |
---|---|---|
committer | Jed Barber <jjbarber@y7mail.com> | 2017-05-14 13:33:27 +1000 |
commit | f3638a598d55629bf130c648416ca75f5edae1f1 (patch) | |
tree | bef111db3ab51c3233b60380ecc3ab6d25441eae /src/fltk-widgets-groups-windows.adb | |
parent | 371cccdf78fa9aaf49158ea57e598abcd5ff56f0 (diff) |
Cleaned up Draw/Handle code on Ada side
Diffstat (limited to 'src/fltk-widgets-groups-windows.adb')
-rw-r--r-- | src/fltk-widgets-groups-windows.adb | 75 |
1 files changed, 30 insertions, 45 deletions
diff --git a/src/fltk-widgets-groups-windows.adb b/src/fltk-widgets-groups-windows.adb index f92a3a5..130b87a 100644 --- a/src/fltk-widgets-groups-windows.adb +++ b/src/fltk-widgets-groups-windows.adb @@ -17,15 +17,6 @@ package body FLTK.Widgets.Groups.Windows is (W, H : in System.Address); pragma Import (C, window_set_handle_hook, "window_set_handle_hook"); - procedure fl_window_draw - (W : in System.Address); - pragma Import (C, fl_window_draw, "fl_window_draw"); - - function fl_window_handle - (W : in System.Address; - E : in Interfaces.C.int) - return Interfaces.C.int; - pragma Import (C, fl_window_handle, "fl_window_handle"); function new_fl_window (X, Y, W, H : in Interfaces.C.int; @@ -42,6 +33,7 @@ package body FLTK.Widgets.Groups.Windows is (W : in System.Address); pragma Import (C, free_fl_window, "free_fl_window"); + procedure fl_window_show (W : in System.Address); pragma Import (C, fl_window_show, "fl_window_show"); @@ -72,43 +64,15 @@ package body FLTK.Widgets.Groups.Windows is (W : in System.Address); pragma Import (C, fl_window_set_non_modal, "fl_window_set_non_modal"); + procedure fl_window_draw + (W : in System.Address); + pragma Import (C, fl_window_draw, "fl_window_draw"); - - - procedure Draw_Hook (U : in System.Address); - pragma Convention (C, Draw_Hook); - - procedure Draw_Hook - (U : in System.Address) - is - package Window_Convert is new System.Address_To_Access_Conversions (Window'Class); - - Ada_Window : access Window'Class := - Window_Convert.To_Pointer (U); - begin - Ada_Window.Draw; - end Draw_Hook; - - - - - procedure Draw - (This : in out Window) is - begin - fl_window_draw (This.Void_Ptr); - end Draw; - - - - - function Handle - (This : in out Window; - Event : in Event_Kind) - return Event_Outcome is - begin - return Event_Outcome'Val - (fl_window_handle (This.Void_Ptr, Event_Kind'Pos (Event))); - end Handle; + function fl_window_handle + (W : in System.Address; + E : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_window_handle, "fl_window_handle"); @@ -248,5 +212,26 @@ package body FLTK.Widgets.Groups.Windows is end Set_Non_Modal; + + + procedure Draw + (This : in out Window) is + begin + fl_window_draw (This.Void_Ptr); + end Draw; + + + + + function Handle + (This : in out Window; + Event : in Event_Kind) + return Event_Outcome is + begin + return Event_Outcome'Val + (fl_window_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + end Handle; + + end FLTK.Widgets.Groups.Windows; |