summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJed Barber <jjbarber@y7mail.com>2017-05-22 20:58:53 +1000
committerJed Barber <jjbarber@y7mail.com>2017-05-22 20:58:53 +1000
commite5f4cdd01d2a4b3673d543cba7539d691244af3a (patch)
treedf35c99bb26fb5672b19592793e7342c605f8119
parent09f7dae9a2268107eec28a68939bb27b4a219cc7 (diff)
Updated to work with updated FLTK Ada binding
-rw-r--r--src/adapad.adb3
-rw-r--r--src/windows-editor.adb3
-rw-r--r--src/windows-jump.adb4
-rw-r--r--src/windows-jump.ads4
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;