From 468cdc37c83cd51eb1b0656bc7faeaf2099e0918 Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Tue, 13 Mar 2018 17:46:33 +1100
Subject: Updated to work with non-inherited constructors in FLTK binding

---
 src/windows-jump.adb | 47 +++++++++++++----------------------------------
 1 file changed, 13 insertions(+), 34 deletions(-)

(limited to 'src/windows-jump.adb')

diff --git a/src/windows-jump.adb b/src/windows-jump.adb
index 7503ec7..898ce04 100644
--- a/src/windows-jump.adb
+++ b/src/windows-jump.adb
@@ -30,29 +30,29 @@ package body Windows.Jump is
     function Create
         return Jump_Window
     is
-        My_Width  : Integer := 350;
-        My_Height : Integer := 110;
+        My_Width  : constant Integer := 350;
+        My_Height : constant Integer := 110;
 
-        Button_Width  : Integer := 140;
-        Button_Height : Integer := 40;
+        Button_Width  : constant Integer := 140;
+        Button_Height : constant Integer := 40;
 
-        Input_Line  : Integer := 10;
-        Button_Line : Integer := 60;
+        Input_Line  : constant Integer := 10;
+        Button_Line : constant Integer := 60;
 
-        Input_Width  : Integer := 240;
-        Input_Height : Integer := 25;
-        Input_Margin_Right : Integer := 10;
+        Input_Width  : constant Integer := 240;
+        Input_Height : constant Integer := 25;
+        Input_Margin_Right : constant Integer := 10;
     begin
         return This : Jump_Window :=
-                   (WD.Double_Window'(WD.Create (0, 0, My_Width, My_Height, "Jump")) with
+               (WD.Double_Window'(WD.Forge.Create (0, 0, My_Width, My_Height, "Jump")) with
 
-                    To_Line => IT.Integer_Input'(IT.Create
+                    To_Line => IT.Integer_Input'(IT.Forge.Create
                         (My_Width - Input_Width - Input_Margin_Right,
                          Input_Line, Input_Width, Input_Height, "Jump to:")),
-                    Cancel => BU.Button'(BU.Create
+                    Cancel => BU.Button'(BU.Forge.Create
                         ((My_Width - 2 * Button_Width) / 3,
                          Button_Line, Button_Width, Button_Height, "Cancel")),
-                    Go_Jump => EN.Enter_Button'(EN.Create
+                    Go_Jump => EN.Enter_Button'(EN.Forge.Create
                         ((My_Width - 2 * Button_Width) * 2 / 3 + Button_Width,
                          Button_Line, Button_Width, Button_Height, "Jump")),
 
@@ -74,27 +74,6 @@ package body Windows.Jump is
 
 
 
-    function Create
-           (X, Y, W, H : in Integer;
-            Label_Text : in String)
-        return Jump_Window is
-    begin
-        return Create;
-    end Create;
-
-
-
-
-    function Create
-           (W, H : in Integer)
-        return Jump_Window is
-    begin
-        return Create;
-    end Create;
-
-
-
-
     procedure Set_Jump_Callback
            (This : in out Jump_Window;
             Func : in     Jump_Callback) is
-- 
cgit