pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

HelpUtil: replace Shell with fpSystem; PropListUtil: fix to always return UTF8, as encoded.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5024 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
macpgmr
2016-07-22 18:19:20 +00:00
parent 4f4b878e17
commit a7cab840e7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/xdev_toolkit/HelpUtil.pas
View File

@@ -123,7 +123,7 @@ begin
Result := shrSuccess; Result := shrSuccess;
{$ELSE} {$ELSE}
{$IFDEF DARWIN} {$IFDEF DARWIN}
if Shell('Open -a "HelpViewer" "' + Application.HelpFile + '"') = 127 then if fpSystem('Open -a "HelpViewer" "' + Application.HelpFile + '"') = 127 then
// Note: Renamed from Help Viewer.app to HelpViewer.app with 10.5. // Note: Renamed from Help Viewer.app to HelpViewer.app with 10.5.
// //
// Note: With OS X earlier than 10.4 (Tiger), if connected to network // Note: With OS X earlier than 10.4 (Tiger), if connected to network
@@ -137,7 +137,7 @@ begin
{$ELSE} {For now, shell to first browser found, passing help file name} {$ELSE} {For now, shell to first browser found, passing help file name}
if GetBrowserPath <> '' then {Found a browser?} if GetBrowserPath <> '' then {Found a browser?}
begin begin
if Shell(GetBrowserPath + ' ' + Application.HelpFile) = 127 then if fpSystem(GetBrowserPath + ' ' + Application.HelpFile) = 127 then
Result := shrViewerError Result := shrViewerError
else else
Result := shrSuccess; Result := shrSuccess;

4
components/xdev_toolkit/PropListUtil.pas
View File

@@ -131,7 +131,7 @@ begin
if not Assigned(Value) then {Key not found?} if not Assigned(Value) then {Key not found?}
Exit; Exit;
if CFGetTypeID(Value) = CFStringGetTypeID then {Value is a string?} if CFGetTypeID(Value) = CFStringGetTypeID then {Value is a string?}
Result := CFStrToAnsiStr(Value); Result := CFStrToAnsiStr(Value, kCFStringEncodingUTF8); //will always be UTF8
end; end;
@@ -166,7 +166,7 @@ begin
ValueRef := CFBundleGetValueForInfoDictionaryKey(BundleRef, KeyRef); ValueRef := CFBundleGetValueForInfoDictionaryKey(BundleRef, KeyRef);
if CFGetTypeID(ValueRef) <> CFStringGetTypeID then {Value not a string?} if CFGetTypeID(ValueRef) <> CFStringGetTypeID then {Value not a string?}
Exit; Exit;
Result := CFStrToAnsiStr(ValueRef); Result := CFStrToAnsiStr(ValueRef, kCFStringEncodingUTF8); //will always be UTF8
finally finally
FreeCFRef(KeyRef); FreeCFRef(KeyRef);
end; end;