Changeset 27 for Include/Classes/System/Drawing/PointF.ab

Timestamp:

Dec 11, 2006, 6:14:09 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Addを静的メソッドへ

File:

• Include/Classes/System/Drawing/PointF.ab (modified) (2 diffs)

Include/Classes/System/Drawing/PointF.ab

@@ -58 +58 @@
     End Sub
 
+    Function Operator () As PointF
+        Dim ptf As PointF(X, Y)
+        Return ptf
+    End Function
+
     Function Operator + (pt As PointF) As PointF
-        Return Add(pt)
+        Return Add(This, pt)
     End Function
 
     Function Operator + (sz As Size) As PointF
-        Return Add(sz)
+        Return Add(This, sz)
     End Function
 
     Function Operator + (sz As SizeF) As PointF
-        Return Add(sz)
+        Return Add(This, sz)
     End Function
 
     Function Operator - (pt As PointF) As PointF
-        Return Substract(pt)
+        Return Substract(This, pt)
     End Function
 
     Function Operator - (sz As Size) As PointF
-        Return Substract(sz)
+        Return Substract(This, sz)
     End Function
 
     Function Operator - (sz As SizeF) As PointF
-        Return Substract(sz)
+        Return Substract(This, sz)
     End Function
 
@@ -90 +95 @@
     End Function
 
-    Function Add(pt As PointF) As PointF
-        Dim ret As PointF(x + pt.x, y + pt.y)
+    Static Function Add(pt1 As PointF, pt2 As PointF) As PointF
+        Dim ret As PointF(pt1.x + pt2.x, pt1.y + pt2.y)
         Return ret
     End Function
 
-    Function Add(sz As Size) As PointF
-        Dim ret As PointF(x + sz.width, y + sz.height)
+    Static Function Add(pt As PointF, sz As Size) As PointF
+        Dim ret As PointF(pt.x + sz.Width, pt.y + sz.Height)
         Return ret
     End Function
 
-    Function Add(sz As SizeF) As PointF
-        Dim ret As PointF(x + sz.width, y + sz.height)
+    Static Function Add(pt As PointF, sz As SizeF) As PointF
+        Dim ret As PointF(pt.x + sz.Width, pt.y + sz.Height)
         Return ret
     End Function
 
-    Function Substract(pt As PointF) As PointF
-        Dim ret As PointF(x - pt.x, y - pt.y)
+    Static Function Substract((pt1 As PointF, pt2 As PointF) As PointF
+        Dim ret As PointF(pt1.x - pt2.x, pt1.y - pt2.y)
         Return ret
     End Function
 
-    Function Substract(sz As Size) As PointF
-        Dim ret As PointF(x - sz.width, y - sz.height)
+    Static Function Substract(pt As PointF, sz As Size) As PointF
+        Dim ret As PointF(pt.x - sz.Width, pt.y - sz.Height)
         Return ret
     End Function
 
-    Function Substract(sz As SizeF) As PointF
-        Dim ret As PointF(x - sz.width, y - sz.height)
+    Static Function Substract(pt As PointF, sz As SizeF) As PointF
+        Dim ret As PointF(pt.x - sz.Width, pt.y - sz.Height)
         Return ret
     End Function