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

* more unicode fixes

Browse Source 
git-svn-id: branches/unicodekvm@48621 -
This commit is contained in:
nickysn 2021-02-10 17:25:53 +00:00
parent d41d6de6ec
commit 829404a957
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/fv/src/dialogs.inc
View File

@ -1527,10 +1527,19 @@ BEGIN
If Data <> Sw_PString_Empty Then Begin { Data ptr valid }
If (Validator = Nil) OR (Validator^.Transfer(Data Sw_PString_DeRef,
@Rec, vtGetData) = 0) Then Begin { No validator/data }
{$ifdef FV_UNICODE}
Sw_String(Rec):=Data;
{$else FV_UNICODE}
FillChar(Rec, DataSize, #0); { Clear the data area }
Move(Data Sw_PString_DeRef, Rec, SizeOf(Sw_Char)*(Length(Data Sw_PString_DeRef) + 1)); { Transfer our data }
Move(Data^, Rec, Length(Data^) + 1); { Transfer our data }
{$endif FV_UNICODE}
End;
End Else FillChar(Rec, DataSize, #0); { Clear the data area }
End Else
{$ifdef FV_UNICODE}
Sw_String(Rec):='';
{$else FV_UNICODE}
FillChar(Rec, DataSize, #0); { Clear the data area }
{$endif FV_UNICODE}
END;
{--TInputLine---------------------------------------------------------------}
@ -1541,7 +1550,11 @@ BEGIN
If Data <> Sw_PString_Empty Then Begin { Data ptr valid }
If (Validator = Nil) OR (Validator^.Transfer(
Data Sw_PString_DeRef, @Rec, vtSetData) = 0) Then { No validator/data }
Move(Rec, Data Sw_PString_DeRef[0], DataSize); { Set our data }
{$ifdef FV_UNICODE}
Data := Sw_String(Rec);
{$else FV_UNICODE}
Move(Rec, Data^[0], DataSize); { Set our data }
{$endif FV_UNICODE}
End;
SelectAll(True); { Now select all }
END;