From 0fe68e7c9edc24226fdfe9fe93d6ceef9fce4824 Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Wed, 10 Feb 2021 12:47:48 +0000
Subject: [PATCH] * updated the uses clauses of the unicode versions of the
 app, dialogs, msgbox   and validate units to use only unicode units in their
 uses clause

git-svn-id: branches/unicodekvm@48586 -
---
 packages/fv/src/app.inc      |  9 +++++++--
 packages/fv/src/dialogs.inc  | 13 +++++++++++--
 packages/fv/src/msgbox.inc   | 11 ++++++++++-
 packages/fv/src/validate.inc |  4 ++++
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/packages/fv/src/app.inc b/packages/fv/src/app.inc
index fdfd75208c..b58ab96130 100644
--- a/packages/fv/src/app.inc
+++ b/packages/fv/src/app.inc
@@ -70,8 +70,13 @@ USES
    Dos,
    Video,
    FVCommon, {Memory,}                                { GFV standard units }
-   Objects, Drivers, Views, Menus, HistList, Dialogs,
-   msgbox, fvconsts;
+   Objects,
+{$ifdef FV_UNICODE}
+   UDrivers, UViews, UMenus, UHistList, UDialogs, Umsgbox,
+{$else FV_UNICODE}
+   Drivers, Views, Menus, HistList, Dialogs, msgbox,
+{$endif FV_UNICODE}
+   fvconsts;
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
diff --git a/packages/fv/src/dialogs.inc b/packages/fv/src/dialogs.inc
index f28e1d74d0..5a8b03232e 100644
--- a/packages/fv/src/dialogs.inc
+++ b/packages/fv/src/dialogs.inc
@@ -64,10 +64,15 @@ USES
    {$ENDIF}
 
    {$IFDEF OS_OS2}                                    { OS2 CODE }
-     OS2Def, DosCalls, PMWIN,                       { Standard units }
+     OS2Def, DosCalls, PMWIN,                         { Standard units }
    {$ENDIF}
 
-   FVCommon, FVConsts, Objects, Drivers, Views, Validate;         { Standard GFV units }
+   FVCommon, FVConsts, Objects,                       { Standard GFV units }
+{$ifdef FV_UNICODE}
+   UDrivers, UViews, UValidate;
+{$else FV_UNICODE}
+   Drivers, Views, Validate;
+{$endif FV_UNICODE}
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
@@ -1040,7 +1045,11 @@ resourcestring  slCancel='Cancel';
                                 IMPLEMENTATION
 {<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>}
 
+{$ifdef FV_UNICODE}
+USES UApp,UHistList;                             { Standard GFV unit }
+{$else FV_UNICODE}
 USES App,HistList;                               { Standard GFV unit }
+{$endif FV_UNICODE}
 
 {***************************************************************************}
 {                         PRIVATE DEFINED CONSTANTS                         }
diff --git a/packages/fv/src/msgbox.inc b/packages/fv/src/msgbox.inc
index 33f3a2bcfc..ec9232a839 100644
--- a/packages/fv/src/msgbox.inc
+++ b/packages/fv/src/msgbox.inc
@@ -85,7 +85,12 @@ UNIT MsgBox;
 {$V-} { Turn off strict VAR strings }
 {====================================================================}
 
-USES objects, dialogs;                                 { Standard GFV units }
+USES objects,                                 { Standard GFV units }
+{$ifdef FV_UNICODE}
+     udialogs;
+{$else FV_UNICODE}
+     dialogs;
+{$endif FV_UNICODE}
 
 {***************************************************************************}
 {                              PUBLIC CONSTANTS                             }
@@ -172,7 +177,11 @@ FUNCTION InputBoxRect (Var Bounds: TRect; Const Title, ALabel: String;
                                 IMPLEMENTATION
 {<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>}
 
+{$ifdef FV_UNICODE}
+USES UDrivers, UViews, UApp{, Resource};                 { Standard GFV units }
+{$else FV_UNICODE}
 USES Drivers, Views, App{, Resource};                    { Standard GFV units }
+{$endif FV_UNICODE}
 
 {***************************************************************************}
 {                            INTERFACE ROUTINES                             }
diff --git a/packages/fv/src/validate.inc b/packages/fv/src/validate.inc
index a6f3e6e89f..1c3f1ea6a2 100644
--- a/packages/fv/src/validate.inc
+++ b/packages/fv/src/validate.inc
@@ -300,7 +300,11 @@ CONST
                                 IMPLEMENTATION
 {<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>}
 
+{$ifdef FV_UNICODE}
+USES UMsgBox;                                         { GFV standard unit }
+{$else FV_UNICODE}
 USES MsgBox;                                          { GFV standard unit }
+{$endif FV_UNICODE}
 
 {***************************************************************************}
 {                              PRIVATE ROUTINES                             }