Changeset 303 for trunk/Include/Classes/System/Drawing/Rectangle.ab

Timestamp:

Aug 24, 2007, 11:14:46 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

フルコンパイルでのミスあぶり出し。註：修正は全て@300や@301以前に行われた。

File:

• trunk/Include/Classes/System/Drawing/Rectangle.ab (modified) (7 diffs)

trunk/Include/Classes/System/Drawing/Rectangle.ab

@@ -110 +110 @@
     End Function
 
-    Function Operator == (rc As Rectangle)
+    Function Operator == (rc As Rectangle) As Boolean
         Return Equals(rc)
     End Function
 
-    Function Operator <> (rc As Rectangle)
-        Return Not Equals(rc)
+    Function Operator <> (rc As Rectangle) As Boolean
+        Return (Not Equals(rc))
     End Function
 
@@ -147 +147 @@
 
     Sub Inflate(dx As Long, dy As Long)
-        X -= dx
-        Y -= dy
-        Width += dx + dx
-        Height += dy + dy
+        x -= dx
+        y -= dy
+        width += dx + dx
+        height += dy + dy
     End Sub
 
@@ -158 +158 @@
 
     Static Function Inflate(rc As Rectangle, x As Long, y As Long) As Rectangle
-        Inflate = New Rectangle(rc)
+        Inflate = New Rectangle(rc.X, rc.Y, rc.Width, rc.Height)
         Inflate.Inflate(x, y)
     End Function
 
     Sub Intersect(rect As Rectangle)
-        This = Rectangle.Intersect(This, rect)
+        Dim r = Rectangle.Intersect(This, rect)
+        x = r.x
+        y = r.y
+        width = r.width
+        height = r.height
     End Sub
 
     Static Function Intersect(a As Rectangle, ByRef b As Rectangle) As Rectangle
         Dim right As Long, bottom As Long, left As Long, top As Long
-        right = Math.Min(a.Right, b.Right)
-        bottom = Math.Min(a.Bottom, b.Bottom)
-        left = Math.Min(a.Left, b.Left)
-        top = Math.Min(a.Top, b.Top)
+        right = System.Math.Min(a.Right, b.Right)
+        bottom = System.Math.Min(a.Bottom, b.Bottom)
+        left = System.Math.Min(a.Left, b.Left)
+        top = System.Math.Min(a.Top, b.Top)
         Return Rectangle.FromLTRB(left, top, right, bottom)
     End Function
@@ -184 +188 @@
     Static Function Union(a As Rectangle, b As Rectangle) As Rectangle
         Dim right As Long, bottom As Long, left As Long, top As Long
-        right = Math.Max(a.Right(), b.Right())
-        bottom = Math.Max(a.Bottom(), b.Bottom())
-        left = Math.Max(a.Left(), b.Left())
-        top = Math.Max(a.Top(), b.Top())
+        right = System.Math.Max(a.Right(), b.Right())
+        bottom = System.Math.Max(a.Bottom(), b.Bottom())
+        left = System.Math.Max(a.Left(), b.Left())
+        top = System.Math.Max(a.Top(), b.Top())
         Return FromLTRB(left, top, right, bottom)
     End Function
@@ -196 +200 @@
 
     Sub Offset(dx As Long, dy As Long)
-        X += dx
-        Y += dy
+        x += dx
+        y += dy
     End Sub
 
     Static Function Ceiling(rcf As RectangleF) As Rectangle
         Dim r As Rectangle(
-            Math.Ceiling(rcf.X),
-            Math.Ceiling(rcf.Y),
-            Math.Ceiling(rcf.Width),
-            Math.Ceiling(rcf.Height))
+            System.Math.Ceiling(rcf.X) As Long,
+            System.Math.Ceiling(rcf.Y) As Long,
+            System.Math.Ceiling(rcf.Width) As Long,
+            System.Math.Ceiling(rcf.Height) As Long)
         Return r
     End Function
@@ -211 +215 @@
     Static Function Round(rcf As RectangleF) As Rectangle
         Dim r As Rectangle(
-            Math.Round(rcf.X),
-            Math.Round(rcf.Y),
-            Math.Round(rcf.Width),
-            Math.Round(rcf.Height))
+            System.Math.Round(rcf.X) As Long,
+            System.Math.Round(rcf.Y) As Long,
+            System.Math.Round(rcf.Width) As Long,
+            System.Math.Round(rcf.Height) As Long)
         Return r
     End Function
@@ -220 +224 @@
     Static Function Truncate(rcf As RectangleF) As Rectangle
         Dim r As Rectangle(
-            Math.Truncate(rcf.X),
-            Math.Truncate(rcf.Y),
-            Math.Truncate(rcf.Width),
-            Math.Truncate(rcf.Height))
+            System.Math.Truncate(rcf.X) As Long,
+            System.Math.Truncate(rcf.Y) As Long,
+            System.Math.Truncate(rcf.Width) As Long,
+            System.Math.Truncate(rcf.Height) As Long)
         Return r
     End Function