Changes in Include/Classes/System/Drawing/Point.ab [11:29]

File:

• Include/Classes/System/Drawing/Point.ab (modified) (4 diffs)

Include/Classes/System/Drawing/Point.ab

@@ -4 +4 @@
 #define __SYSTEM_DRAWING_POINT_AB__
 
+#include <Classes/System/Drawing/PointF.ab>
 #include <Classes/System/Drawing/Size.ab>
 #include <Classes/System/Drawing/SizeF.ab>
@@ -64 +65 @@
 
     Function Operator + (pt As Point) As Point
-        Return Add(pt)
+        Return Add(This, pt)
     End Function
 
     Function Operator + (sz As Size) As Point
-        Return Add(sz)
+        Return Add(This, sz)
     End Function
 
     Function Operator - (pt As Point) As Point
-        Return Substract(pt)
+        Return Substract(This, pt)
     End Function
 
     Function Operator - (sz As Size) As Point
-        Return Substract(sz)
+        Return Substract(This, sz)
     End Function
 
@@ -87 +88 @@
     End Function
 
-    Function Add(pt As Point) As Point
-        Dim ret As Point(x + pt.x, y + pt.y)
+    Static Function Add(pt1 As Point, pt2 As Point) As Point
+        Dim ret As Point(pt1.x + pt2.x, pt1.y + pt2.y)
         Return ret
     End Function
 
-    Function Add(sz As Size) As Point
-        Dim ret As Point(x + sz.width, y + sz.height)
+    Static Function Add(pt As Point, sz As Size) As Point
+        Dim ret As Point(pt.x + sz.Width, pt.y + sz.Height)
         Return ret
     End Function
@@ -99 +100 @@
     Function Offset(pt As Point) As Point
         Dim ret As Point(x + pt.x, y + pt.y)
-    End Function
-
-    Function Offset(dx As Long, dy As Long) As Point
-        Dim ret As Point(x + dx, y + dy)
-    End Function
-
-    Function Substract(pt As Point) As Point
-        Dim ret As Point(x - pt.x, y - pt.y)
         Return ret
     End Function
 
-    Function Substract(sz As Size) As Point
-        Dim ret As Point(x - sz.width, y - sz.height)
+    Sub Offset(dx As Long, dy As Long)
+        x += dx
+        y += dy
+    End Sub
+
+    Static Function Substract(pt1 As Point, pt2 As Point) As Point
+        Dim ret As Point(pt1.x - pt2.x, pt1.y - pt2.y)
+        Return ret
+    End Function
+
+    Static Function Substract(pt As Point, sz As Size) As Point
+        Dim ret As Point(pt.x - sz.Width, pt.y - sz.Height)
         Return ret
     End Function