Changeset 27 for Include/Classes/System/Drawing
- Timestamp:
- Dec 11, 2006, 6:14:09 PM (18 years ago)
- Location:
- Include/Classes/System/Drawing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Include/Classes/System/Drawing/Point.ab
r11 r27 4 4 #define __SYSTEM_DRAWING_POINT_AB__ 5 5 6 #include <Classes/System/Drawing/PointF.ab> 6 7 #include <Classes/System/Drawing/Size.ab> 7 8 #include <Classes/System/Drawing/SizeF.ab> … … 64 65 65 66 Function Operator + (pt As Point) As Point 66 Return Add( pt)67 Return Add(This, pt) 67 68 End Function 68 69 69 70 Function Operator + (sz As Size) As Point 70 Return Add( sz)71 Return Add(This, sz) 71 72 End Function 72 73 73 74 Function Operator - (pt As Point) As Point 74 Return Substract( pt)75 Return Substract(This, pt) 75 76 End Function 76 77 77 78 Function Operator - (sz As Size) As Point 78 Return Substract( sz)79 Return Substract(This, sz) 79 80 End Function 80 81 … … 87 88 End Function 88 89 89 Function Add(pt As Point) As Point 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) 92 Return ret 93 End Function 94 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) 97 Return ret 98 End Function 99 100 Sub Offset(pt As Point) As Point 90 101 Dim ret As Point(x + pt.x, y + pt.y) 91 102 Return ret 92 103 End Function 93 104 94 Function Add(sz As Size) As Point 95 Dim ret As Point(x + sz.width, y + sz.height) 105 Sub Offset(dx As Long, dy As Long) 106 x += dx 107 y += dy 108 End Function 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) 96 112 Return ret 97 113 End Function 98 114 99 Function Offset(pt As Point) As Point 100 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) 109 Return ret 110 End Function 111 112 Function Substract(sz As Size) As Point 113 Dim ret As Point(x - sz.width, y - sz.height) 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) 114 117 Return ret 115 118 End Function -
Include/Classes/System/Drawing/PointF.ab
r1 r27 58 58 End Sub 59 59 60 Function Operator () As PointF 61 Dim ptf As PointF(X, Y) 62 Return ptf 63 End Function 64 60 65 Function Operator + (pt As PointF) As PointF 61 Return Add( pt)66 Return Add(This, pt) 62 67 End Function 63 68 64 69 Function Operator + (sz As Size) As PointF 65 Return Add( sz)70 Return Add(This, sz) 66 71 End Function 67 72 68 73 Function Operator + (sz As SizeF) As PointF 69 Return Add( sz)74 Return Add(This, sz) 70 75 End Function 71 76 72 77 Function Operator - (pt As PointF) As PointF 73 Return Substract( pt)78 Return Substract(This, pt) 74 79 End Function 75 80 76 81 Function Operator - (sz As Size) As PointF 77 Return Substract( sz)82 Return Substract(This, sz) 78 83 End Function 79 84 80 85 Function Operator - (sz As SizeF) As PointF 81 Return Substract( sz)86 Return Substract(This, sz) 82 87 End Function 83 88 … … 90 95 End Function 91 96 92 Function Add(ptAs PointF) As PointF93 Dim ret As PointF( x + pt.x, y + pt.y)97 Static Function Add(pt1 As PointF, pt2 As PointF) As PointF 98 Dim ret As PointF(pt1.x + pt2.x, pt1.y + pt2.y) 94 99 Return ret 95 100 End Function 96 101 97 Function Add(sz As Size) As PointF98 Dim ret As PointF( x + sz.width, y + sz.height)102 Static Function Add(pt As PointF, sz As Size) As PointF 103 Dim ret As PointF(pt.x + sz.Width, pt.y + sz.Height) 99 104 Return ret 100 105 End Function 101 106 102 Function Add(sz As SizeF) As PointF103 Dim ret As PointF( x + sz.width, y + sz.height)107 Static Function Add(pt As PointF, sz As SizeF) As PointF 108 Dim ret As PointF(pt.x + sz.Width, pt.y + sz.Height) 104 109 Return ret 105 110 End Function 106 111 107 Function Substract(ptAs PointF) As PointF108 Dim ret As PointF( x - pt.x, y - pt.y)112 Static Function Substract((pt1 As PointF, pt2 As PointF) As PointF 113 Dim ret As PointF(pt1.x - pt2.x, pt1.y - pt2.y) 109 114 Return ret 110 115 End Function 111 116 112 Function Substract(sz As Size) As PointF113 Dim ret As PointF( x - sz.width, y - sz.height)117 Static Function Substract(pt As PointF, sz As Size) As PointF 118 Dim ret As PointF(pt.x - sz.Width, pt.y - sz.Height) 114 119 Return ret 115 120 End Function 116 121 117 Function Substract(sz As SizeF) As PointF118 Dim ret As PointF( x - sz.width, y - sz.height)122 Static Function Substract(pt As PointF, sz As SizeF) As PointF 123 Dim ret As PointF(pt.x - sz.Width, pt.y - sz.Height) 119 124 Return ret 120 125 End Function
Note:
See TracChangeset
for help on using the changeset viewer.