Changeset 473 for trunk/Include/Classes/System/Drawing/PointF.ab

Timestamp:

Mar 12, 2008, 9:54:46 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

実験として書いていたControlクラスを追加（せめてコミット前に既存のContorolに混ぜようとしたがコンパイルできなかった）。
ほかForms, Drawing及びGDI+の修正。

File:

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

trunk/Include/Classes/System/Drawing/PointF.ab

@@ -1 +1 @@
 ' Classes/System/Drawing/PointF.ab
 
-#ifndef __SYSTEM_DRAWING_POINTF_AB__
-#define __SYSTEM_DRAWING_POINTF_AB__
-
-#include <Classes/System/Drawing/Size.ab>
-#include <Classes/System/Drawing/SizeF.ab>
+Namespace System
+Namespace Drawing
 
 Class PointF
@@ -30 +27 @@
 
     Function X() As Single
-        Return x
+        X = x
     End Function
 
@@ -38 +35 @@
 
     Function Y() As Single
-        Return y
+        Y = y
     End Function
 
@@ -82 +79 @@
 
     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
+        Return New PointF(pt1.x + pt2.x, pt1.y + pt2.y)
     End Function
 
     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
+        Return New PointF(pt.x + sz.Width, pt.y + sz.Height)
     End Function
 
     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
+        Return New PointF(pt.x + sz.Width, pt.y + sz.Height)
     End Function
 
     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
+        Return New PointF(pt1.x - pt2.x, pt1.y - pt2.y)
     End Function
 
     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
+        Return New PointF(pt.x - sz.Width, pt.y - sz.Height)
     End Function
 
     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
+        Return New PointF(pt.x - sz.Width, pt.y - sz.Height)
     End Function
 
@@ -124 +115 @@
 End Class
 
-#endif '__SYSTEM_DRAWING_POINTF_AB__
+End Namespace
+End Namespace