paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-26 12:44:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

LResources: remove support for the DisableWindowsUnicodeSupport define (as we've done before in LCL).

Browse Source 
(cherry picked from commit 048f337abe)
This commit is contained in:
Bart 2023-11-15 13:16:50 +01:00 committed by Maxim Ganetsky
parent ad8e69f7c9
commit 56d3bf0395
1 changed files with 2 additions and 31 deletions

33
lcl/lresources.pp
View File

@ -2684,7 +2684,7 @@ end;
procedure LRSObjectTextToBinary(Input, Output: TStream; Links: TLRPositionLinks);
var
parser: {$IFDEF DisableWindowsUnicodeSupport}TParser{$ELSE}TUTF8Parser{$ENDIF};
parser: TParser;
OldDecimalSeparator: Char;
OldThousandSeparator: Char;
TokenStartPos: LongInt;
@ -2746,35 +2746,6 @@ var
WriteInteger(StrToInt(s));
end;
{$IFDEF DisableWindowsUnicodeSupport}
function WideStringNeeded(const s: widestring): Boolean;
var
i: Integer;
begin
i:=length(s);
while (i>=1) and (ord(s[i])<256) do dec(i);
Result:=i>=1;
end;
function WideStrToAnsiStrWithoutConversion(const s: widestring): string;
var
i: Integer;
begin
SetLength(Result,Length(s){$IFDEF WideStringLenDoubled} div 2{$ENDIF});
for i:=1 to length(Result) do
Result[i]:=chr(ord(s[i]));
end;
function WideStrToShortStrWithoutConversion(const s: widestring): shortstring;
var
i: Integer;
begin
SetLength(Result,Length(s){$IFDEF WideStringLenDoubled} div 2{$ENDIF});
for i:=1 to length(Result) do
Result[i]:=chr(ord(s[i]));
end;
{$ENDIF}
function ParserNextToken: Char;
begin
TokenStartPos:=Parser.SourcePos;
@ -3045,7 +3016,7 @@ begin
// sort links for LFM positions
Links.Sort(true);
end;
parser := {$IFDEF DisableWindowsUnicodeSupport}TParser{$ELSE}TUTF8Parser{$ENDIF}.Create(Input);
parser := TParser.Create(Input);
OldDecimalSeparator:=DefaultFormatSettings.DecimalSeparator;
DefaultFormatSettings.DecimalSeparator:='.';
OldThousandSeparator:=DefaultFormatSettings.ThousandSeparator;