From 468cdc37c83cd51eb1b0656bc7faeaf2099e0918 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Tue, 13 Mar 2018 17:46:33 +1100 Subject: Updated to work with non-inherited constructors in FLTK binding --- src/windows-replace.adb | 67 +++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 44 deletions(-) (limited to 'src/windows-replace.adb') diff --git a/src/windows-replace.adb b/src/windows-replace.adb index dd3703d..1393711 100644 --- a/src/windows-replace.adb +++ b/src/windows-replace.adb @@ -34,47 +34,47 @@ package body Windows.Replace is function Create return Replace_Window is - My_Width : Integer := 350; - My_Height : Integer := 180; + My_Width : constant Integer := 350; + My_Height : constant Integer := 180; - Button_Width : Integer := 140; - Button_Height : Integer := 40; + Button_Width : constant Integer := 140; + Button_Height : constant Integer := 40; - Find_Line : Integer := 10; - Replace_Line : Integer := 40; - Match_Line : Integer := 80; - Rep_All_Line : Integer := 100; - Button_Line : Integer := 130; + Find_Line : constant Integer := 10; + Replace_Line : constant Integer := 40; + Match_Line : constant Integer := 80; + Rep_All_Line : constant Integer := 100; + Button_Line : constant Integer := 130; - Input_Width : Integer := 220; - Input_Height : Integer := 25; - Input_Margin_Right : Integer := 10; + Input_Width : constant Integer := 220; + Input_Height : constant Integer := 25; + Input_Margin_Right : constant Integer := 10; - Check_Width : Integer := 100; - Check_Height : Integer := 20; - Check_Margin_Left : Integer := 50; + Check_Width : constant Integer := 100; + Check_Height : constant Integer := 20; + Check_Margin_Left : constant Integer := 50; - Text_Size : Integer := 12; + Text_Size : constant Integer := 12; begin return This : Replace_Window := - (WD.Double_Window'(WD.Create (0, 0, My_Width, My_Height, "Replace")) with + (WD.Double_Window'(WD.Forge.Create (0, 0, My_Width, My_Height, "Replace")) with - Find_What => IP.Input'(IP.Create + Find_What => IP.Input'(IP.Forge.Create (My_Width - Input_Width - Input_Margin_Right, Find_Line, Input_Width, Input_Height, "Find what:")), - Replace_With => IP.Input'(IP.Create + Replace_With => IP.Input'(IP.Forge.Create (My_Width - Input_Width - Input_Margin_Right, Replace_Line, Input_Width, Input_Height, "Replace with:")), - Match_Case => LC.Check_Button'(LC.Create + Match_Case => LC.Check_Button'(LC.Forge.Create (Check_Margin_Left, Match_Line, Check_Width, Check_Height, "Match case")), - Replace_All => LC.Check_Button'(LC.Create + Replace_All => LC.Check_Button'(LC.Forge.Create (Check_Margin_Left, Rep_All_Line, Check_Width, Check_Height, "Replace all")), - Cancel => BU.Button'(BU.Create + Cancel => BU.Button'(BU.Forge.Create ((My_Width - 2 * Button_Width) / 3, Button_Line, Button_Width, Button_Height, "Cancel")), - Start => EN.Enter_Button'(EN.Create + Start => EN.Enter_Button'(EN.Forge.Create ((My_Width - 2 * Button_Width) * 2 / 3 + Button_Width, Button_Line, Button_Width, Button_Height, "Replace")), @@ -99,27 +99,6 @@ package body Windows.Replace is - function Create - (X, Y, W, H : in Integer; - Label_Text : in String) - return Replace_Window is - begin - return Create; - end Create; - - - - - function Create - (W, H : in Integer) - return Replace_Window is - begin - return Create; - end Create; - - - - procedure Set_Replace_Callback (This : in out Replace_Window; Func : in Replace_Callback) is -- cgit