paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-05-12 06:32:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r39984 into '.':

Browse Source 
U    rtl/objpas/types.pp
--- Recording mergeinfo for merge of r39984 into '.':
 U   .

# revisions: 39984

git-svn-id: branches/fixes_3_2@40525 -
This commit is contained in:
marco 2018-12-11 17:20:15 +00:00
parent 6205e530aa
commit 9712af7fc4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtl/objpas/types.pp
View File

@ -325,8 +325,8 @@ type
end; end;
function EqualRect(const r1,r2 : TRect) : Boolean; function EqualRect(const r1,r2 : TRect) : Boolean;
function Rect(Left,Top,Right,Bottom : Integer) : TRect; function Rect(Left,Top,Right,Bottom : Integer) : TRect; inline;
function Bounds(ALeft,ATop,AWidth,AHeight : Integer) : TRect; function Bounds(ALeft,ATop,AWidth,AHeight : Integer) : TRect; inline;
function Point(x,y : Integer) : TPoint; inline; function Point(x,y : Integer) : TPoint; inline;
function PtInRect(const Rect : TRect; const p : TPoint) : Boolean; function PtInRect(const Rect : TRect; const p : TPoint) : Boolean;
function IntersectRect(var Rect : TRect; const R1,R2 : TRect) : Boolean; function IntersectRect(var Rect : TRect; const R1,R2 : TRect) : Boolean;
@ -335,7 +335,7 @@ function IsRectEmpty(const Rect : TRect) : Boolean;
function OffsetRect(var Rect : TRect;DX : Integer;DY : Integer) : Boolean; function OffsetRect(var Rect : TRect;DX : Integer;DY : Integer) : Boolean;
function CenterPoint(const Rect: TRect): TPoint; function CenterPoint(const Rect: TRect): TPoint;
function InflateRect(var Rect: TRect; dx: Integer; dy: Integer): Boolean; function InflateRect(var Rect: TRect; dx: Integer; dy: Integer): Boolean;
function Size(AWidth, AHeight: Integer): TSize; function Size(AWidth, AHeight: Integer): TSize; inline;
function Size(const ARect: TRect): TSize; function Size(const ARect: TRect): TSize;
implementation implementation
@ -352,7 +352,7 @@ begin
EqualRect:=(r1.left=r2.left) and (r1.right=r2.right) and (r1.top=r2.top) and (r1.bottom=r2.bottom); EqualRect:=(r1.left=r2.left) and (r1.right=r2.right) and (r1.top=r2.top) and (r1.bottom=r2.bottom);
end; end;
function Rect(Left,Top,Right,Bottom : Integer) : TRect; function Rect(Left,Top,Right,Bottom : Integer) : TRect; inline;
begin begin
Rect.Left:=Left; Rect.Left:=Left;
@ -361,7 +361,7 @@ begin
Rect.Bottom:=Bottom; Rect.Bottom:=Bottom;
end; end;
function Bounds(ALeft,ATop,AWidth,AHeight : Integer) : TRect; function Bounds(ALeft,ATop,AWidth,AHeight : Integer) : TRect; inline;
begin begin
Bounds.Left:=ALeft; Bounds.Left:=ALeft;
@ -497,13 +497,13 @@ begin
Result := False; Result := False;
end; end;
function Size(AWidth, AHeight: Integer): TSize; function Size(AWidth, AHeight: Integer): TSize; inline;
begin begin
Result.cx := AWidth; Result.cx := AWidth;
Result.cy := AHeight; Result.cy := AHeight;
end; end;
function Size(const ARect: TRect): TSize; function Size(const ARect: TRect): TSize; inline;
begin begin
Result.cx := ARect.Right - ARect.Left; Result.cx := ARect.Right - ARect.Left;
Result.cy := ARect.Bottom - ARect.Top; Result.cy := ARect.Bottom - ARect.Top;