From e5f4cdd01d2a4b3673d543cba7539d691244af3a Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Mon, 22 May 2017 20:58:53 +1000 Subject: Updated to work with updated FLTK Ada binding --- src/adapad.adb | 3 ++- src/windows-editor.adb | 3 ++- src/windows-jump.adb | 4 ++-- src/windows-jump.ads | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/adapad.adb b/src/adapad.adb index 46c4258..2d4096d 100644 --- a/src/adapad.adb +++ b/src/adapad.adb @@ -4,7 +4,6 @@ with FLTK.Widgets.Menus; with FLTK.Widgets.Groups.Windows; with FLTK.Text_Buffers; with FLTK.Dialogs; -with FLTK.Enums; use FLTK.Enums; with Windows.Editor; with Windows.About; with Windows.Find; @@ -631,6 +630,7 @@ begin -- definitely need to work out a better tabular structure for this code block declare + use FLTK; use FLTK.Widgets.Menus; Bar : Menu_Cursor := Editor.Get_Menu_Bar; begin @@ -668,6 +668,7 @@ begin declare + use FLTK; use FLTK.Widgets.Menus; Pop : Menu_Cursor := Editor.Get_Rightclick_Menu; begin diff --git a/src/windows-editor.adb b/src/windows-editor.adb index e6d98bf..81e5633 100644 --- a/src/windows-editor.adb +++ b/src/windows-editor.adb @@ -1,6 +1,5 @@ -with FLTK.Enums; use FLTK.Enums; with FLTK.Widgets.Groups.Windows.Double; with FLTK.Widgets.Groups.Text_Displays.Text_Editors; with FLTK.Widgets.Menus.Menu_Bars; @@ -25,6 +24,8 @@ package body Windows.Editor is Label_Text : in String) return Editor_Window is + use FLTK; + Width : Integer := Min_Editor_Width; Height : Integer := Min_Editor_Height; Menu_Height : Integer := 22; diff --git a/src/windows-jump.adb b/src/windows-jump.adb index 64bd6f6..13f9cd0 100644 --- a/src/windows-jump.adb +++ b/src/windows-jump.adb @@ -2,7 +2,7 @@ with FLTK.Widgets.Groups.Windows.Double; with FLTK.Widgets.Buttons.Enter; -with FLTK.Widgets.Inputs.Int; +with FLTK.Widgets.Inputs.Integer; package body Windows.Jump is @@ -11,7 +11,7 @@ package body Windows.Jump is package WD renames FLTK.Widgets.Groups.Windows.Double; package BU renames FLTK.Widgets.Buttons; package EN renames FLTK.Widgets.Buttons.Enter; - package IT renames FLTK.Widgets.Inputs.Int; + package IT renames FLTK.Widgets.Inputs.Integer; diff --git a/src/windows-jump.ads b/src/windows-jump.ads index baf355c..f47db24 100644 --- a/src/windows-jump.ads +++ b/src/windows-jump.ads @@ -2,7 +2,7 @@ with FLTK.Widgets.Groups.Windows.Double; private with FLTK.Widgets.Buttons.Enter; -private with FLTK.Widgets.Inputs.Int; +private with FLTK.Widgets.Inputs.Integer; package Windows.Jump is @@ -40,7 +40,7 @@ private type Jump_Window is new FLTK.Widgets.Groups.Windows.Double.Double_Window with record - To_Line : FLTK.Widgets.Inputs.Int.Integer_Input; + To_Line : FLTK.Widgets.Inputs.Integer.Integer_Input; Cancel : FLTK.Widgets.Buttons.Button; Go_Jump : FLTK.Widgets.Buttons.Enter.Enter_Button; Callback : Jump_Callback; -- cgit