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

ShellCtrls: Use ExpandFileNameUtf8 instead of ExpandFileName.

Browse Source 
git-svn-id: trunk@41150 -
This commit is contained in:
bart 2013-05-12 11:09:46 +00:00
parent 1650d36464
commit 2b795c385b
1 changed files with 7 additions and 7 deletions

14
lcl/shellctrls.pas
View File

@ -360,8 +360,8 @@ begin
//Delphi raises an unspecified exception in this case, but don't crash the IDE at designtime
if not (csDesigning in ComponentState)
and (AValue <> '')
and not DirectoryExistsUtf8(ExpandFilename(AValue)) then
Raise Exception.CreateFmt(SShellCtrlsInvalidRoot,[ExpandFileName(AValue)]);
and not DirectoryExistsUtf8(ExpandFilenameUtf8(AValue)) then
Raise Exception.CreateFmt(SShellCtrlsInvalidRoot,[ExpandFileNameUtf8(AValue)]);
if (AValue = '') then
FRoot := GetBasePath
else
@ -375,7 +375,7 @@ begin
begin
//Add a node for Root and expand it (issue #0024230)
//Make FRoot contain fully qualified pathname, we need it later in GetPathFromNode()
FRoot := ExpandFileName(FRoot);
FRoot := ExpandFileNameUtf8(FRoot);
//Set RootNode.Text to AValue so user can choose if text is fully qualified path or not
RootNode := Items.AddChild(nil, AValue);
RootNode.HasChildren := True;
@ -781,9 +781,9 @@ var
else Result := ANode.Text;
end;
begin
//writeln('SetPath: FRoot = "',FRoot,'" GetRootPath = "',getrootpath,'"');
writeln('SetPath: FRoot = "',FRoot,'" GetRootPath = "',getrootpath,'"',' AValue=',AValue);
if (GetRootPath <> '') then
FQRootPath := IncludeTrailingPathDelimiter(ExpandFileName(GetRootPath))
FQRootPath := IncludeTrailingPathDelimiter(ExpandFileNameUtf8(GetRootPath))
else
FQRootPath := '';
RootIsAbsolute := (FQRootPath = '') or (FQRootPath = PathDelim)
@ -797,7 +797,7 @@ begin
FQPath := FQRootPath + AValue;
end
else
FQPath := ExcludeTrailingPathDelimiter(ExpandFileName(AValue));
FQPath := ExcludeTrailingPathDelimiter(ExpandFileNameUtf8(AValue));
if not DirectoryExistsUTF8(FQPath) then
begin
//writeln('SetPath: InvalidPath: ',AValue);
@ -900,7 +900,7 @@ begin
//Delphi raises an unspecified exception in this case, but don't crash the IDE at designtime
if not (csDesigning in ComponentState)
and (Value <> '')
and not DirectoryExistsUtf8(ExpandFilename(Value)) then
and not DirectoryExistsUtf8(ExpandFilenameUtf8(Value)) then
Raise Exception.CreateFmt(SShellCtrlsInvalidRoot,[Value]);
FRoot := Value;
Clear;