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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

Object.ReferenceEqualsを追加

File:

• Include/Classes/System/Drawing/RectangleF.ab (modified) (10 diffs)

Include/Classes/System/Drawing/RectangleF.ab

@@ -31 +31 @@
     End Sub
 
-    Sub RectangleF(ByRef rc As RectangleF)
+    Sub RectangleF(rc As RectangleF)
         x = rc.x
         y = rc.y
@@ -43 +43 @@
     End Function
 
-    Sub Location(ByRef point As PointF)
+    Sub Location(point As PointF)
         x = point.X
         y = point.Y
@@ -52 +52 @@
     End Function
 
-    Sub Size(ByRef size As SizeF)
+    Sub Size(size As SizeF)
         width = size.Width
         height = size.Height
@@ -112 +112 @@
         End If
     End Function
-
+/*
     Function Operator =(ByRef rc As RectangleF)
         With rc
@@ -121 +121 @@
         End With
     End Function
-
-    Function Operator ==(ByRef rc As RectangleF)
+*/
+    Function Operator ==(rc As RectangleF)
         Return Equals(rc)
     End Function
 
-    Function Operator <>(ByRef rc As RectangleF)
+    Function Operator <>(rc As RectangleF)
         Return Not Equals(rc)
     End Function
 
-    Function Equals(ByRef rc As RectangleF) As Boolean
+    Function Equals(rc As RectangleF) 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
@@ -143 +143 @@
 
     Static Function FromLTRB(l As Single, t As Single, r As Single, b As Single) As RectangleF
-        Dim rect As RectangleF(l, t, r - l, b - t)
-        return rect
+        return New RectangleF(l, t, r - l, b - t)
     End Function
 
@@ -155 +154 @@
     End Function
 
-    Function Contains(ByRef pt As PointF) As Boolean
-        ContainsPTF = Contains(pt.X, pt.Y)
-    End Function
-
-    Function Contains(ByRef rc As RectangleF) As Boolean
+    Function Contains(pt As PointF) As Boolean
+        Return Contains(pt.X, pt.Y)
+    End Function
+
+    Function Contains(rc As RectangleF) 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
@@ -178 +177 @@
     End Sub
 
-    Static Function Inflate(ByRef rc As RectangleF, x As Single, y As Single) As RectangleF
-        Inflate = rc
+    Static Function Inflate(rc As RectangleF, x As Single, y As Single) As RectangleF
+        Inflate = New Rectangle(rc)
         Inflate.Inflate(x, y)
     End Function
 
-    Sub Intersect(ByRef rect As RectangleF)
+    Sub Intersect(rect As RectangleF)
         This = RectangleF.Intersect(This, rect)
     End Sub
     
-    Static Function Intersect(ByRef a As RectangleF, ByRef b As RectangleF) As RectangleF
+    Static Function Intersect(a As RectangleF, b As RectangleF) As RectangleF
         Dim right As Single, bottom As Single, left As Single, top As Single
         right = Math.Min(a.Right, b.Right)
@@ -196 +195 @@
     End Function
 
-    Function IntersectsWith(ByRef rc As RectangleF) As Boolean
+    Function IntersectsWith(rc As RectangleF) As Boolean
         If Left < rc.Right And _
             Top < rc.Bottom And _
@@ -207 +206 @@
     End Function
 
-    Static Function Union(ByRef a As RectangleF, ByRef b As RectangleF) As RectangleF
+    Static Function Union(a As RectangleF, b As RectangleF) As RectangleF
         Dim right As Single, bottom As Single, left As Single, top As Single
         right = Math.Max(a.Right(), b.Right())