Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Include/Classes/System/Drawing/Point.ab

    r29 r11  
    44#define __SYSTEM_DRAWING_POINT_AB__
    55
    6 #include <Classes/System/Drawing/PointF.ab>
    76#include <Classes/System/Drawing/Size.ab>
    87#include <Classes/System/Drawing/SizeF.ab>
    … …  
    6564
    6665    Function Operator + (pt As Point) As Point
    67         Return Add(This, pt)
     66        Return Add(pt)
    6867    End Function
    6968
    7069    Function Operator + (sz As Size) As Point
    71         Return Add(This, sz)
     70        Return Add(sz)
    7271    End Function
    7372
    7473    Function Operator - (pt As Point) As Point
    75         Return Substract(This, pt)
     74        Return Substract(pt)
    7675    End Function
    7776
    7877    Function Operator - (sz As Size) As Point
    79         Return Substract(This, sz)
     78        Return Substract(sz)
    8079    End Function
    8180
    … …  
    8887    End Function
    8988
    90     Static Function Add(pt1 As Point, pt2 As Point) As Point
    91         Dim ret As Point(pt1.x + pt2.x, pt1.y + pt2.y)
     89    Function Add(pt As Point) As Point
     90        Dim ret As Point(x + pt.x, y + pt.y)
    9291        Return ret
    9392    End Function
    9493
    95     Static Function Add(pt As Point, sz As Size) As Point
    96         Dim ret As Point(pt.x + sz.Width, pt.y + sz.Height)
     94    Function Add(sz As Size) As Point
     95        Dim ret As Point(x + sz.width, y + sz.height)
    9796        Return ret
    9897    End Function
    … …  
    10099    Function Offset(pt As Point) As Point
    101100        Dim ret As Point(x + pt.x, y + pt.y)
     101    End Function
     102
     103    Function Offset(dx As Long, dy As Long) As Point
     104        Dim ret As Point(x + dx, y + dy)
     105    End Function
     106
     107    Function Substract(pt As Point) As Point
     108        Dim ret As Point(x - pt.x, y - pt.y)
    102109        Return ret
    103110    End Function
    104111
    105     Sub Offset(dx As Long, dy As Long)
    106         x += dx
    107         y += dy
    108     End Sub
    109 
    110     Static Function Substract(pt1 As Point, pt2 As Point) As Point
    111         Dim ret As Point(pt1.x - pt2.x, pt1.y - pt2.y)
    112         Return ret
    113     End Function
    114 
    115     Static Function Substract(pt As Point, sz As Size) As Point
    116         Dim ret As Point(pt.x - sz.Width, pt.y - sz.Height)
     112    Function Substract(sz As Size) As Point
     113        Dim ret As Point(x - sz.width, y - sz.height)
    117114        Return ret
    118115    End Function
Note: See TracChangeset for help on using the changeset viewer.