Changeset 212 for Include/Classes/System/Drawing/Rectangle.ab

Timestamp:

Apr 13, 2007, 5:12:31 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Object.ReferenceEqualsを追加

File:

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

Include/Classes/System/Drawing/Rectangle.ab

@@ -48 +48 @@
     End Function
 
-    Sub Location(ByRef point As Point)
+    Sub Location(point As Point)
         x = point.X
         y = point.Y
@@ -57 +57 @@
     End Function
 
-    Sub Size(ByRef size As Size)
+    Sub Size(size As Size)
         width = size.Width
         height = size.Height
@@ -117 +117 @@
         End If
     End Function
-
-    Function Operator = (ByRef rc As Rectangle)
+/*
+    Function Operator = (rc As Rectangle)
         With rc
             x = .x
@@ -126 +126 @@
         End With
     End Function
-
-    Function Operator == (ByRef rc As Rectangle)
+*/
+    Function Operator == (rc As Rectangle)
         Return Equals(rc)
     End Function
 
-    Function Operator <> (ByRef rc As Rectangle)
+    Function Operator <> (rc As Rectangle)
         Return Not Equals(rc)
     End Function
 
     Function Operator () As RectangleF
-        Dim r As RectangleF(x, y, width, height)
-        Return r
-    End Function
-
-    Function Equals(ByRef rc As Rectangle) As Boolean
+        Return New RectangleF(x, y, width, height)
+    End Function
+
+    Function Equals(rc As Rectangle) As Boolean
         If X = rc.X And Y = rc.Y And Width = rc.Width And Height = rc.Height Then
-            Equals = _System_TRUE
-        Else
-            Equals = _System_FALSE
+            Return True
+        Else
+            Return False
         End If
     End Function
@@ -153 +152 @@
 
     Static Function FromLTRB(l As Long, t As Long, r As Long, b As Long) As Rectangle
-        Dim rect As Rectangle(l, t, r - l, r - b)
-        return rect
+        return New Rectangle(l, t, r - l, r - b)
     End Function
 
     Function Contains(x As Long, y As Long) As Boolean
         If x >= X And x < X + Width And y >= Y And y < Y + Height Then
-            Contains = _System_TRUE
-        Else
-            Contains = _System_FALSE
-        End If
-    End Function
-
-    Function Contains(ByRef pt As Point) As Boolean
-        ContainsPTF = Contains(pt.X, pt.Y)
-    End Function
-
-    Function Contains(ByRef rc As Rectangle) As Boolean
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+    Function Contains(pt As Point) As Boolean
+        Return Contains(pt.X, pt.Y)
+    End Function
+
+    Function Contains(rc As Rectangle) As Boolean
         If X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom Then
-            ContainsRCF = _System_TRUE
-        Else
-            ContainsRCF = _System_FALSE
+            Return True
+        Else
+            Return False
         End If
     End Function
@@ -188 +186 @@
     End Sub
 
-    Static Function Inflate(ByRef rc As Rectangle, x As Long, y As Long) As Rectangle
-        Inflate = rc
+    Static Function Inflate(rc As Rectangle, x As Long, y As Long) As Rectangle
+        Inflate = New Rectangle(rc)
         Inflate.Inflate(x, y)
     End Function
 
-    Sub Intersect(ByRef rect As Rectangle)
+    Sub Intersect(rect As Rectangle)
         This = Rectangle.Intersect(This, rect)
     End Sub
 
-    Static Function Intersect(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
+    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)
@@ -206 +204 @@
     End Function
 
-    Function IntersectsWith(ByRef rc As Rectangle) As Boolean
+    Function IntersectsWith(rc As Rectangle) As Boolean
         If Left < rc.Right And _
             Top < rc.Bottom And _
             Right > rc.Left And _
             Bottom > rc.Top Then
-            IntersectsWith = _System_TRUE
-        Else
-            IntersectsWith = _System_FALSE
-        End If
-    End Function
-
-    Static Function Union(ByRef a As Rectangle, ByRef b As Rectangle) As Rectangle
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+    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())