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

* more unicode fixes

Browse Source 
git-svn-id: branches/unicodekvm@48635 -
This commit is contained in:
nickysn 2021-02-10 21:48:54 +00:00
parent af4d301af9
commit 6cbf84eca6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2642,7 +2642,7 @@ BEGIN
Inherited Init(Bounds, AStrings); { Call ancestor } Inherited Init(Bounds, AStrings); { Call ancestor }
SelRange := ASelRange; { Hold select range } SelRange := ASelRange; { Hold select range }
Flags := AFlags; { Hold flags } Flags := AFlags; { Hold flags }
States := NewStr(AStates); { Hold string } States := Sw_NewStr(AStates); { Hold string }
END; END;
{--TMultiCheckBoxes---------------------------------------------------------} {--TMultiCheckBoxes---------------------------------------------------------}
@ -2653,7 +2653,11 @@ BEGIN
Inherited Load(S); { Call ancestor } Inherited Load(S); { Call ancestor }
S.Read(SelRange, SizeOf(SelRange)); { Read select range } S.Read(SelRange, SizeOf(SelRange)); { Read select range }
S.Read(Flags, SizeOf(Flags)); { Read flags } S.Read(Flags, SizeOf(Flags)); { Read flags }
{$ifdef FV_UNICODE}
States := S.ReadUnicodeString; { Read strings }
{$else FV_UNICODE}
States := S.ReadStr; { Read strings } States := S.ReadStr; { Read strings }
{$endif FV_UNICODE}
END; END;
{--TMultiCheckBoxes---------------------------------------------------------} {--TMultiCheckBoxes---------------------------------------------------------}
@ -2661,7 +2665,9 @@ END;
{---------------------------------------------------------------------------} {---------------------------------------------------------------------------}
DESTRUCTOR TMultiCheckBoxes.Done; DESTRUCTOR TMultiCheckBoxes.Done;
BEGIN BEGIN
{$ifndef FV_UNICODE}
If (States <> Nil) Then DisposeStr(States); { Dispose strings } If (States <> Nil) Then DisposeStr(States); { Dispose strings }
{$endif FV_UNICODE}
Inherited Done; { Call ancestor } Inherited Done; { Call ancestor }
END; END;
@ -2735,7 +2741,11 @@ BEGIN
TCluster.Store(S); { TCluster store called } TCluster.Store(S); { TCluster store called }
S.Write(SelRange, SizeOf(SelRange)); { Write select range } S.Write(SelRange, SizeOf(SelRange)); { Write select range }
S.Write(Flags, SizeOf(Flags)); { Write select flags } S.Write(Flags, SizeOf(Flags)); { Write select flags }
{$ifdef FV_UNICODE}
S.WriteUnicodeString(States); { Write strings }
{$else FV_UNICODE}
S.WriteStr(States); { Write strings } S.WriteStr(States); { Write strings }
{$endif FV_UNICODE}
END; END;
{+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++} {+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++}