diff options
Diffstat (limited to 'src/adapad.adb')
| -rw-r--r-- | src/adapad.adb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/adapad.adb b/src/adapad.adb index ee0941a..943a49c 100644 --- a/src/adapad.adb +++ b/src/adapad.adb @@ -6,7 +6,10 @@ with FLTK.Widgets.Menus; with FLTK.Widgets.Groups.Windows; with FLTK.Text_Buffers; with FLTK.Popups; -with Editor_Windows; +with Windows.Editor; +with Windows.About; +with Windows.Find; +with Windows.Replace; with Ada.Strings.Unbounded; use Ada.Strings.Unbounded; @@ -18,7 +21,6 @@ function Adapad return Integer is package WN renames FLTK.Widgets.Groups.Windows; package TB renames FLTK.Text_Buffers; package D renames FLTK.Popups; - package ED renames Editor_Windows; @@ -38,11 +40,11 @@ function Adapad return Integer is -- global state of the text editor - Editor : ED.Editor_Window := ED.Create (800, 500); - Buffer : TB.Text_Buffer := TB.Create; - About : ED.About_Window := ED.Create; - Find : ED.Find_Window := ED.Create; - Replace : ED.Replace_Window := ED.Create; + Editor : Windows.Editor.Editor_Window := Windows.Editor.Create (800, 500); + Buffer : TB.Text_Buffer := TB.Create; + About : Windows.About.About_Window := Windows.About.Create; + Find : Windows.Find.Find_Window := Windows.Find.Create; + Replace : Windows.Replace.Replace_Window := Windows.Replace.Create; Changed : Boolean := False; Filename : Unbounded_String := To_Unbounded_String (0); @@ -278,7 +280,7 @@ function Adapad return Integer is -- callbacks for the find/replace windows - type Do_Find_Callback is new Editor_Windows.Find_Callback with null record; + type Do_Find_Callback is new Windows.Find.Find_Callback with null record; Do_Find_CB : aliased Do_Find_Callback; overriding procedure Call @@ -302,7 +304,7 @@ function Adapad return Integer is - type Do_Replace_Callback is new Editor_Windows.Replace_Callback with null record; + type Do_Replace_Callback is new Windows.Replace.Replace_Callback with null record; Do_Replace_CB : aliased Do_Replace_Callback; overriding procedure Call |