paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-05 04:39:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

EditorMacroScript: Workaround for Mac, prevent using edx in result for TPoint

Browse Source 
git-svn-id: trunk@39403 -
This commit is contained in:
martin 2012-11-28 21:53:32 +00:00
parent c2891838cf
commit f3f3521292
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/macroscript/emscriptclasses.pas
View File

@ -22,7 +22,12 @@ procedure ExecRegisterTClipboard(cl: TPSRuntimeClassImporter; AExec: TPSExec);
implementation implementation
function Point(AX, AY: Integer): TPoint; {$IFDEF darwin}
type
TPoint2 = record x,y,a,b,c: Longint; end;
{$ENDIF}
function Point(AX, AY: Integer): {$IFDEF darwin}TPoint2{$ELSE}TPoint{$ENDIF};
begin begin
with Result do with Result do
begin begin
@ -59,7 +64,7 @@ const
FuncInputQuery: function(const ACaption, APrompt: string; var Value : string): Boolean = @InputQuery; FuncInputQuery: function(const ACaption, APrompt: string; var Value : string): Boolean = @InputQuery;
DeclPoint = 'function Point(AX, AY: Integer): TPoint;'; DeclPoint = 'function Point(AX, AY: Integer): TPoint;';
FuncPoint: function(AX, AY: Integer): TPoint = @Point; // @Classes.Point; FuncPoint: function(AX, AY: Integer): {$IFDEF darwin}TPoint2{$ELSE}TPoint{$ENDIF} = @Point; // @Classes.Point;
Decltest_ord_mt = 'function test_ord_mt(AType: TMsgDlgType): Integer;'; Decltest_ord_mt = 'function test_ord_mt(AType: TMsgDlgType): Integer;';
Decltest_ord_mb = 'function test_ord_mb(ABtn: TMsgDlgBtn): Integer;'; Decltest_ord_mb = 'function test_ord_mb(ABtn: TMsgDlgBtn): Integer;';
@ -73,7 +78,7 @@ procedure CompRegisterBasics(AComp: TPSPascalCompiler);
end; end;
begin begin
AComp.AddTypeS('TPoint', 'record x,y: Longint; end;'); AComp.AddTypeS('TPoint', 'record x,y' {$IFDEF darwin} +',a,b,c'{$ENDIF} + ': Longint; end;');
AComp.AddDelphiFunction(DeclPoint); AComp.AddDelphiFunction(DeclPoint);
AddConst('mrNone', 'Integer', mrNone); AddConst('mrNone', 'Integer', mrNone);
@ -145,7 +150,7 @@ procedure TSynEdit_LogicalCaretXY_R(Self: TSynEdit; var P: TPoint);
begin P := Self.LogicalCaretXY; end; begin P := Self.LogicalCaretXY; end;
procedure TSynEdit_LogicalCaretX_W(Self: TSynEdit; const I: Integer); procedure TSynEdit_LogicalCaretX_W(Self: TSynEdit; const I: Integer);
begin Self.LogicalCaretXY := Point(I, Self.CaretY); end; begin Self.LogicalCaretXY := Classes.Point(I, Self.CaretY); end;
procedure TSynEdit_LogicalCaretX_R(Self: TSynEdit; var I: Integer); procedure TSynEdit_LogicalCaretX_R(Self: TSynEdit; var I: Integer);
begin I := Self.LogicalCaretXY.X; end; begin I := Self.LogicalCaretXY.X; end;