paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes so demo apps compile with FPC 3.0 on non-Windows platforms.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4455 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
macpgmr 2016-01-22 14:54:35 +00:00
parent 3611a8ccbf
commit 453823d8bf
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/thtmlport/demo_src/demounit.pas
View File

@ -345,9 +345,9 @@ if (I <= 2) or (J > 0) then
nil, SW_SHOWNORMAL); nil, SW_SHOWNORMAL);
{$ELSE} //Not sure if this makes any sense since executable won't have .exe. {$ELSE} //Not sure if this makes any sense since executable won't have .exe.
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open -n "' + S + '" --args "' + Params + '"'); fpSystem('open -n "' + S + '" --args "' + Params + '"');
{$ELSE} {$ELSE}
Shell('"' + S + '" "' + Params + '"'); fpSystem('"' + S + '" "' + Params + '"');
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
@ -378,9 +378,9 @@ if (I > 0) or (J > 0) then
ShellExecute(0, nil, pchar(URL), nil, nil, SW_SHOWNORMAL); ShellExecute(0, nil, pchar(URL), nil, nil, SW_SHOWNORMAL);
{$ELSE} {$ELSE}
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open "' + URL + '"'); fpSystem('open "' + URL + '"');
{$ELSE} {$ELSE}
Shell('"' + URL + '"'); //use LCL's OpenURL? fpSystem('"' + URL + '"'); //use LCL's OpenURL?
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
Handled := True; Handled := True;
@ -865,11 +865,11 @@ begin
StrPCopy(PC2, NewWindowFile), nil, SW_SHOWNORMAL); StrPCopy(PC2, NewWindowFile), nil, SW_SHOWNORMAL);
{$ELSE} {$ELSE}
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open -n "' + fpSystem('open -n "' +
ExtractFileDir(ExtractFileDir(ExtractFileDir(ParamStr(0)))) + ExtractFileDir(ExtractFileDir(ExtractFileDir(ParamStr(0)))) +
'" --args "' + NewWindowFile + '"'); '" --args "' + NewWindowFile + '"');
{$ELSE} {$ELSE}
Shell('"' + ParamStr(0) + '" "' + NewWindowFile + '"'); fpSystem('"' + ParamStr(0) + '" "' + NewWindowFile + '"');
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}

16
components/thtmlport/demo_src/fdemunit.pas
View File

@ -291,9 +291,9 @@ if (I <= 2) or (J > 0) then
nil, SW_SHOWNORMAL); nil, SW_SHOWNORMAL);
{$ELSE} //Not sure if this makes any sense since executable won't have .exe. {$ELSE} //Not sure if this makes any sense since executable won't have .exe.
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open -n "' + S + '" --args "' + Params + '"'); fpSystem('open -n "' + S + '" --args "' + Params + '"');
{$ELSE} {$ELSE}
Shell('"' + S + '" "' + Params + '"'); fpSystem('"' + S + '" "' + Params + '"');
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
@ -324,9 +324,9 @@ if (I > 0) or (J > 0) then
ShellExecute(Handle, nil, StrPCopy(PC, URL), nil, nil, SW_SHOWNORMAL); ShellExecute(Handle, nil, StrPCopy(PC, URL), nil, nil, SW_SHOWNORMAL);
{$ELSE} {$ELSE}
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open "' + URL + '"'); fpSystem('open "' + URL + '"');
{$ELSE} {$ELSE}
Shell('"' + URL + '"'); //use LCL's OpenURL? fpSystem('"' + URL + '"'); //use LCL's OpenURL?
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
Handled := True; Handled := True;
@ -631,11 +631,11 @@ if FileExists(S) then
StrPCopy(PC2, S+Dest), nil, SW_SHOWNORMAL); StrPCopy(PC2, S+Dest), nil, SW_SHOWNORMAL);
{$ELSE} {$ELSE}
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open -n "' + fpSystem('open -n "' +
ExtractFileDir(ExtractFileDir(ExtractFileDir(ParamStr(0)))) + ExtractFileDir(ExtractFileDir(ExtractFileDir(ParamStr(0)))) +
'" --args "' + S+Dest + '"'); '" --args "' + S+Dest + '"');
{$ELSE} {$ELSE}
Shell('"' + ParamStr(0) + '" "' + S+Dest + '"'); fpSystem('"' + ParamStr(0) + '" "' + S+Dest + '"');
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
@ -873,11 +873,11 @@ begin
StrPCopy(PC2, NewWindowFile), nil, SW_SHOWNORMAL); StrPCopy(PC2, NewWindowFile), nil, SW_SHOWNORMAL);
{$ELSE} {$ELSE}
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Shell('open -n "' + fpSystem('open -n "' +
ExtractFileDir(ExtractFileDir(ExtractFileDir(ParamStr(0)))) + ExtractFileDir(ExtractFileDir(ExtractFileDir(ParamStr(0)))) +
'" --args "' + NewWindowFile + '"'); '" --args "' + NewWindowFile + '"');
{$ELSE} {$ELSE}
Shell('"' + ParamStr(0) + '" "' + NewWindowFile + '"'); fpSystem('"' + ParamStr(0) + '" "' + NewWindowFile + '"');
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}
{$ENDIF} {$ENDIF}