From 40870af6a7dc39322622f7c4646b974c0d0800be Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Sat, 27 Feb 2021 17:15:29 +0000
Subject: [PATCH] + added unicode version of the timeddlg unit

git-svn-id: branches/unicodekvm@48829 -
---
 .gitattributes                |  1 +
 packages/fv/fpmake.pp         | 12 ++++++++++++
 packages/fv/src/timeddlg.inc  | 28 +++++++++++++++++++++-------
 packages/fv/src/utimeddlg.pas |  2 ++
 4 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 packages/fv/src/utimeddlg.pas

diff --git a/.gitattributes b/.gitattributes
index 9dd7db9821..ec2fa6a2e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5050,6 +5050,7 @@ packages/fv/src/umenus.pas svneol=native#text/plain
 packages/fv/src/umsgbox.pas svneol=native#text/plain
 packages/fv/src/unixsmsg.inc svneol=native#text/plain
 packages/fv/src/uoutline.pas svneol=native#text/plain
+packages/fv/src/utimeddlg.pas svneol=native#text/plain
 packages/fv/src/uvalidate.pas svneol=native#text/plain
 packages/fv/src/uviews.pas svneol=native#text/plain
 packages/fv/src/validate.inc svneol=native#text/plain
diff --git a/packages/fv/fpmake.pp b/packages/fv/fpmake.pp
index 3528efff50..786e0b5071 100644
--- a/packages/fv/fpmake.pp
+++ b/packages/fv/fpmake.pp
@@ -339,6 +339,18 @@ begin
           AddUnit('app');
           AddUnit('msgbox');
         end;
+    T:=P.Targets.AddUnit('utimeddlg.pas');
+      with T.Dependencies do
+        begin
+          AddInclude('timeddlg.inc');
+          AddInclude('platform.inc');
+          AddUnit('udialogs');
+          AddUnit('fvconsts');
+          AddUnit('udrivers');
+          AddUnit('uviews');
+          AddUnit('uapp');
+          AddUnit('umsgbox');
+        end;
     T:=P.Targets.AddUnit('time.pas');
       with T.Dependencies do
         begin
diff --git a/packages/fv/src/timeddlg.inc b/packages/fv/src/timeddlg.inc
index baf8d53da5..cb5db96c85 100644
--- a/packages/fv/src/timeddlg.inc
+++ b/packages/fv/src/timeddlg.inc
@@ -18,7 +18,11 @@
    MA 02110-1301, USA.
 
  ****************************************************************************}
+{$ifdef FV_UNICODE}
+UNIT utimeddlg;
+{$else FV_UNICODE}
 UNIT timeddlg;
+{$endif FV_UNICODE}
 
 {<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>}
                                   INTERFACE
@@ -49,7 +53,13 @@ UNIT timeddlg;
 {$V-} { Turn off strict VAR strings }
 {====================================================================}
 
-USES objects, dialogs, fvconsts, drivers, views; { Standard GFV unit }
+USES objects,
+  fvconsts,
+{$ifdef FV_UNICODE}
+  ufvcommon, udialogs, udrivers, uviews; { Standard GFV unit }
+{$else FV_UNICODE}
+  fvcommon, dialogs, drivers, views; { Standard GFV unit }
+{$endif FV_UNICODE}
 
 type
   TTimedDialog = object (TDialog)
@@ -68,7 +78,7 @@ type
 (* Must be always included in TTimeDialog! *)
   TTimedDialogText = object (TStaticText)
     constructor Init (var Bounds: TRect);
-    procedure   GetText (var S: string); virtual;
+    procedure   GetText (var S: Sw_String); virtual;
   end;
   PTimedDialogText = ^TTimedDialogText;
 
@@ -97,14 +107,14 @@ const
 
 procedure RegisterTimedDialog;
 
-FUNCTION TimedMessageBox (Const Msg: String; Params: Pointer;
+FUNCTION TimedMessageBox (Const Msg: Sw_String; Params: Pointer;
   AOptions: Word; ASecs: Word): Word;
 
 {-TimedMessageBoxRect------------------------------------------------
 TimedMessageBoxRect allows the specification of a TRect for the message box
 to occupy.
 ---------------------------------------------------------------------}
-FUNCTION TimedMessageBoxRect (Var R: TRect; Const Msg: String; Params: Pointer;
+FUNCTION TimedMessageBoxRect (Var R: TRect; Const Msg: Sw_String; Params: Pointer;
   AOptions: Word; ASecs: Word): Word;
 
 
@@ -114,7 +124,11 @@ FUNCTION TimedMessageBoxRect (Var R: TRect; Const Msg: String; Params: Pointer;
 
 USES
   dos,
+{$ifdef FV_UNICODE}
+  uapp, {resource,} umsgbox;   { Standard GFV units }
+{$else FV_UNICODE}
   app, {resource,} msgbox;   { Standard GFV units }
+{$endif FV_UNICODE}
 
 
 {***************************************************************************}
@@ -127,7 +141,7 @@ begin
 end;
 
 
-procedure TTimedDialogText.GetText (var S: string);
+procedure TTimedDialogText.GetText (var S: Sw_String);
 begin
   if Owner <> nil
 (* and (TypeOf (Owner^) = TypeOf (TTimedDialog)) *)
@@ -203,7 +217,7 @@ end;
 
 
 
-function TimedMessageBox (const Msg: string; Params: pointer;
+function TimedMessageBox (const Msg: Sw_String; Params: pointer;
   AOptions: word; ASecs: word): word;
 var
   R: TRect;
@@ -220,7 +234,7 @@ begin
 end;
 
 
-function TimedMessageBoxRect (var R: TRect; const Msg: string; Params: pointer;
+function TimedMessageBoxRect (var R: TRect; const Msg: Sw_String; Params: pointer;
   AOptions: word; ASecs: word): word;
 var
   Dlg: PTimedDialog;
diff --git a/packages/fv/src/utimeddlg.pas b/packages/fv/src/utimeddlg.pas
new file mode 100644
index 0000000000..76fe19b5e6
--- /dev/null
+++ b/packages/fv/src/utimeddlg.pas
@@ -0,0 +1,2 @@
+{$DEFINE FV_UNICODE}
+{$I timeddlg.inc}