Cleaned up Draw/Handle code on Ada side

1 files changed, 30 insertions, 46 deletions

diff --git a/src/fltk-widgets-groups-windows-single.adb b/src/fltk-widgets-groups-windows-single.adb
index 76d6dac..0416983 100644
--- a/src/fltk-widgets-groups-windows-single.adb
+++ b/src/fltk-widgets-groups-windows-single.adb
@@ -16,15 +16,6 @@ package body FLTK.Widgets.Groups.Windows.Single is
            (W, H : in System.Address);
     pragma Import (C, single_window_set_handle_hook, "single_window_set_handle_hook");
 
-    procedure fl_single_window_draw
-           (W : in System.Address);
-    pragma Import (C, fl_single_window_draw, "fl_single_window_draw");
-
-    function fl_single_window_handle
-           (W : in System.Address;
-            E : in Interfaces.C.int)
-        return Interfaces.C.int;
-    pragma Import (C, fl_single_window_handle, "fl_single_window_handle");
 
     function new_fl_single_window
            (X, Y, W, H : in Interfaces.C.int;
@@ -41,6 +32,7 @@ package body FLTK.Widgets.Groups.Windows.Single is
            (S : in System.Address);
     pragma Import (C, free_fl_single_window, "free_fl_single_window");
 
+
     procedure fl_single_window_show
            (S : in System.Address);
     pragma Import (C, fl_single_window_show, "fl_single_window_show");
@@ -49,44 +41,15 @@ package body FLTK.Widgets.Groups.Windows.Single is
            (S : in System.Address);
     pragma Import (C, fl_single_window_flush, "fl_single_window_flush");
 
+    procedure fl_single_window_draw
+           (W : in System.Address);
+    pragma Import (C, fl_single_window_draw, "fl_single_window_draw");
 
-
-
-    procedure Draw_Hook (U : in System.Address);
-    pragma Convention (C, Draw_Hook);
-
-    procedure Draw_Hook
-           (U : in System.Address)
-    is
-        package Single_Window_Convert is new
-            System.Address_To_Access_Conversions (Single_Window'Class);
-
-        Ada_Window : access Single_Window'Class :=
-            Single_Window_Convert.To_Pointer (U);
-    begin
-        Ada_Window.Draw;
-    end Draw_Hook;
-
-
-
-
-    procedure Draw
-           (This : in out Single_Window) is
-    begin
-        fl_single_window_draw (This.Void_Ptr);
-    end Draw;
-
-
-
-
-    function Handle
-           (This  : in out Single_Window;
-            Event : in     Event_Kind)
-        return Event_Outcome is
-    begin
-        return Event_Outcome'Val
-               (fl_single_window_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
-    end Handle;
+    function fl_single_window_handle
+           (W : in System.Address;
+            E : in Interfaces.C.int)
+        return Interfaces.C.int;
+    pragma Import (C, fl_single_window_handle, "fl_single_window_handle");
 
 
 
@@ -166,5 +129,26 @@ package body FLTK.Widgets.Groups.Windows.Single is
     end Flush;
 
 
+
+
+    procedure Draw
+           (This : in out Single_Window) is
+    begin
+        fl_single_window_draw (This.Void_Ptr);
+    end Draw;
+
+
+
+
+    function Handle
+           (This  : in out Single_Window;
+            Event : in     Event_Kind)
+        return Event_Outcome is
+    begin
+        return Event_Outcome'Val
+               (fl_single_window_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+    end Handle;
+
+
 end FLTK.Widgets.Groups.Windows.Single;