Changeset 473 for trunk/Include/Classes/System/Drawing/Point.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/Point.ab (modified) (6 diffs)

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

@@ -1 +1 @@
 ' Classes/System/Drawing/Point.ab
 
-#ifndef __SYSTEM_DRAWING_POINT_AB__
-#define __SYSTEM_DRAWING_POINT_AB__
-
-#require <Classes/System/Drawing/PointF.ab>
-#require <Classes/System/Drawing/Size.ab>
-#require <Classes/System/Drawing/SizeF.ab>
+Namespace System
+Namespace Drawing
 
 Class Point
@@ -31 +27 @@
 
     Function X() As Long
-        Return x
+        X = x
     End Function
 
@@ -39 +35 @@
 
     Function Y() As Long
-        Return y
+        X = y
     End Function
 
@@ -50 +46 @@
     End Function
 
-    Function Operator + (pt As Point) As Point
+    Function Operator +(pt As Point) As Point
         Return Add(This, pt)
     End Function
 
-    Function Operator + (sz As Size) As Point
+    Function Operator +(sz As Size) As Point
         Return Add(This, sz)
     End Function
 
-    Function Operator - (pt As Point) As Point
+    Function Operator -(pt As Point) As Point
         Return Substract(This, pt)
     End Function
 
-    Function Operator - (sz As Size) As Point
+    Function Operator -(sz As Size) As Point
         Return Substract(This, sz)
     End Function
 
-    Function Operator == (sz As Point) As Boolean
+    Function Operator ==(sz As Point) As Boolean
         Return Equals(sz)
     End Function
 
-    Function Operator <> (sz As Point) As Boolean
+    Function Operator <>(sz As Point) As Boolean
         Return Not Equals(sz)
     End Function
@@ -108 +104 @@
 
     Static Function Ceiling(ptf As PointF) As Point
-        Return New Point(System.Math.Ceiling(ptf.X) As Long, System.Math.Ceiling(ptf.Y) As Long)
+        Return New Point(Math.Ceiling(ptf.X) As Long, Math.Ceiling(ptf.Y) As Long)
     End Function
 
     Static Function Round(ptf As PointF) As Point
-        Return New Point(System.Math.Round(ptf.X) As Long, System.Math.Round(ptf.Y) As Long)
+        Return New Point(Math.Round(ptf.X) As Long, Math.Round(ptf.Y) As Long)
     End Function
 
     Static Function Truncate(ptf As PointF) As Point
-        Return New Point(System.Math.Truncate(ptf.X) As Long, System.Math.Truncate(ptf.Y) As Long)
+        Return New Point(Math.Truncate(ptf.X) As Long, Math.Truncate(ptf.Y) As Long)
     End Function
 
@@ -128 +124 @@
 End Class
 
-#endif '__SYSTEM_DRAWING_POINT_AB__
+End Namespace
+End Namespace