浏览代码

* 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 -

michael 18 年之前
父节点
当前提交
ab2e7337e3
共有 1 个文件被更改,包括 15 次插入2 次删除
  1. 15 2
      rtl/objpas/types.pp

+ 15 - 2
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.