paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-16 01:00:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed compilation after merging of the fpc Unicode branch to fpc 2.3.1

Browse Source 
git-svn-id: trunk@16573 -
This commit is contained in:
vincents 2008-09-12 21:24:45 +00:00
parent 6c562ab050
commit 273220e891
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ideintf/propedits.pp
View File

@ -1714,7 +1714,13 @@ const
TInt64PropertyEditor, // tkInt64
TQWordPropertyEditor, // tkQWord
nil, // tkDynArray
nil // tkInterfaceRaw
nil // tkInterfaceRaw,
{$IF declared(tkUString)}
// can be replaced by {$IFNDEF VER2_2} later, if grace period of older 2.3.1 ends
,nil, // tkProcVar
nil, // tkUString
nil // tkUChar
{$ENDIF}
);
// -----------------------------------------------------------

2
lcl/interfaces/win32/win32callback.inc
View File

@ -1101,7 +1101,7 @@ var
UTF8Char: TUTF8Char;
begin
Result := false;
UTF8Char := UTF8Encode(WideChar(AChar));
UTF8Char := UTF8Encode(widestring(WideChar(AChar)));
lWinControl := WindowInfo^.WinControl;
if Assigned(lWinControl) then
begin

10
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -557,20 +557,20 @@ var
I:=Length(PWideName);
if I < OpenFile^.nFileOffset then
begin
DirName := AppendPathDelim(UTF8Encode(PWideName));
DirName := AppendPathDelim(UTF8Encode(widestring(PWideName)));
Inc(PWideName, Succ(I));
I:=Length(PWideName);
while I > 0 do
begin
// Don't use expand filename here, it expands directories using
// system encoding, not UTF-8
AFiles.Add(DirName + Utf8Encode(PWideName));
AFiles.Add(DirName + Utf8Encode(widestring(PWideName)));
Inc(PWideName,Succ(I));
I:=Length(PWideName);
end;
end
else
AFiles.Add(Utf8Encode(PWideName));
AFiles.Add(Utf8Encode(widestring(PWideName)));
end
else
begin
@ -653,7 +653,7 @@ var
begin
{$ifdef WindowsUnicodeSupport}
if UnicodeEnabledOS then
SelectedStr:=UTF8Encode(PWideChar(OpenFile^.lpStrFile))
SelectedStr:=UTF8Encode(widestring(PWideChar(OpenFile^.lpStrFile)))
else
SelectedStr:=AnsiToUtf8(OpenFile^.lpStrFile);
{$else}
@ -935,7 +935,7 @@ begin
begin
SHGetPathFromIDListW(iidl, BufferW);
CoTaskMemFree(iidl);
TSelectDirectoryDialog(ACommonDialog).FileName := UTF8Encode(BufferW);
TSelectDirectoryDialog(ACommonDialog).FileName := UTF8Encode(widestring(BufferW));
end;
end
else begin