From ab2e7337e342fb559ad7c56a3c1b3f4f3331ad3a Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 24 Nov 2006 09:19:02 +0000 Subject: [PATCH] * Patch from Graeme Geldenhuys: - removed the SIZE = TSize declaration from types.pp - Added two new Size() functions that work the same as Rect(), Bounds() or Point(). git-svn-id: trunk@5464 - --- rtl/objpas/types.pp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/rtl/objpas/types.pp b/rtl/objpas/types.pp index 124df4e47b..9c6a96a847 100644 --- a/rtl/objpas/types.pp +++ b/rtl/objpas/types.pp @@ -92,7 +92,7 @@ type {$endif Windows} PSize = ^TSize; tagSIZE = TSize; - SIZE = TSize; +// SIZE = TSize; TSmallPoint = @@ -264,6 +264,8 @@ function IsRectEmpty(const Rect : TRect) : Boolean; function OffsetRect(var Rect : TRect;DX : Integer;DY : Integer) : Boolean; function CenterPoint(const Rect: TRect): TPoint; function InflateRect(var Rect: TRect; dx: Integer; dy: Integer): Boolean; +function Size(AWidth, AHeight: Integer): TSize; +function Size(ARect: TRect): TSize; implementation @@ -391,7 +393,6 @@ begin end; end; - function InflateRect(var Rect: TRect; dx: Integer; dy: Integer): Boolean; begin if Assigned(@Rect) then @@ -409,6 +410,18 @@ begin Result := False; end; +function Size(AWidth, AHeight: Integer): TSize; +begin + Result.cx := AWidth; + Result.cy := AHeight; +end; + +function Size(ARect: TRect): TSize; +begin + Result.cx := ARect.Right - ARect.Left; + Result.cy := ARect.Bottom - ARect.Top; +end; + end.