paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 08:09:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ added unicode version of the timeddlg unit

Browse Source 
git-svn-id: branches/unicodekvm@48829 -
This commit is contained in:
nickysn 2021-02-27 17:15:29 +00:00
parent 4b6eea1918
commit 40870af6a7
4 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -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/umsgbox.pas svneol=native#text/plain
packages/fv/src/unixsmsg.inc 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/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/uvalidate.pas svneol=native#text/plain
packages/fv/src/uviews.pas svneol=native#text/plain packages/fv/src/uviews.pas svneol=native#text/plain
packages/fv/src/validate.inc svneol=native#text/plain packages/fv/src/validate.inc svneol=native#text/plain

12
packages/fv/fpmake.pp
View File

@ -339,6 +339,18 @@ begin
AddUnit('app'); AddUnit('app');
AddUnit('msgbox'); AddUnit('msgbox');
end; 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'); T:=P.Targets.AddUnit('time.pas');
with T.Dependencies do with T.Dependencies do
begin begin

28
packages/fv/src/timeddlg.inc
View File

@ -18,7 +18,11 @@
MA 02110-1301, USA. MA 02110-1301, USA.
****************************************************************************} ****************************************************************************}
{$ifdef FV_UNICODE}
UNIT utimeddlg;
{$else FV_UNICODE}
UNIT timeddlg; UNIT timeddlg;
{$endif FV_UNICODE}
{<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>} {<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>}
INTERFACE INTERFACE
@ -49,7 +53,13 @@ UNIT timeddlg;
{$V-} { Turn off strict VAR strings } {$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 type
TTimedDialog = object (TDialog) TTimedDialog = object (TDialog)
@ -68,7 +78,7 @@ type
(* Must be always included in TTimeDialog! *) (* Must be always included in TTimeDialog! *)
TTimedDialogText = object (TStaticText) TTimedDialogText = object (TStaticText)
constructor Init (var Bounds: TRect); constructor Init (var Bounds: TRect);
procedure GetText (var S: string); virtual; procedure GetText (var S: Sw_String); virtual;
end; end;
PTimedDialogText = ^TTimedDialogText; PTimedDialogText = ^TTimedDialogText;
@ -97,14 +107,14 @@ const
procedure RegisterTimedDialog; procedure RegisterTimedDialog;
FUNCTION TimedMessageBox (Const Msg: String; Params: Pointer; FUNCTION TimedMessageBox (Const Msg: Sw_String; Params: Pointer;
AOptions: Word; ASecs: Word): Word; AOptions: Word; ASecs: Word): Word;
{-TimedMessageBoxRect------------------------------------------------ {-TimedMessageBoxRect------------------------------------------------
TimedMessageBoxRect allows the specification of a TRect for the message box TimedMessageBoxRect allows the specification of a TRect for the message box
to occupy. 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; AOptions: Word; ASecs: Word): Word;
@ -114,7 +124,11 @@ FUNCTION TimedMessageBoxRect (Var R: TRect; Const Msg: String; Params: Pointer;
USES USES
dos, dos,
{$ifdef FV_UNICODE}
uapp, {resource,} umsgbox; { Standard GFV units }
{$else FV_UNICODE}
app, {resource,} msgbox; { Standard GFV units } app, {resource,} msgbox; { Standard GFV units }
{$endif FV_UNICODE}
{***************************************************************************} {***************************************************************************}
@ -127,7 +141,7 @@ begin
end; end;
procedure TTimedDialogText.GetText (var S: string); procedure TTimedDialogText.GetText (var S: Sw_String);
begin begin
if Owner <> nil if Owner <> nil
(* and (TypeOf (Owner^) = TypeOf (TTimedDialog)) *) (* 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; AOptions: word; ASecs: word): word;
var var
R: TRect; R: TRect;
@ -220,7 +234,7 @@ begin
end; 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; AOptions: word; ASecs: word): word;
var var
Dlg: PTimedDialog; Dlg: PTimedDialog;

2
packages/fv/src/utimeddlg.pas Normal file
View File

@ -0,0 +1,2 @@
{$DEFINE FV_UNICODE}
{$I timeddlg.inc}