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

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

@@ -1 +1 @@
 ' Classes/System/Drawing/Rectangle.ab
 
-#ifndef __SYSTEM_DRAWING_RECTANGLE_AB__
-#define __SYSTEM_DRAWING_RECTANGLE_AB__
-
-'#require <Classes/System/Math.ab>
-#require <Classes/System/Drawing/RectangleF.ab>
-#require <Classes/System/Drawing/Point.ab>
-#require <Classes/System/Drawing/Size.ab>
+Namespace System
+Namespace Drawing
 
 Class Rectangle
@@ -40 +35 @@
 
     Function Location() As Point
-        Dim pt As Point(x, y)
-        Return pt
+        Location = New Point(x, y)
     End Function
 
@@ -50 +44 @@
 
     Function Size() As Size
-        Dim size As Size(width, height)
+        Size = New Size(width, height)
     End Function
 
@@ -59 +53 @@
 
     Function X() As Long
-        Return x
+        X = x
     End Function
 
@@ -67 +61 @@
 
     Function Y() As Long
-        Return y
+        Y = y
     End Function
 
@@ -75 +69 @@
 
     Function Width() As Long
-        Return width
+        Width = width
     End Function
 
@@ -83 +77 @@
 
     Function Height() As Long
-        Return height
+        Height = height
     End Function
 
@@ -91 +85 @@
 
     Function Left() As Long
-        Return X
+        Left = X
     End Function
 
     Function Top() As Long
-        Return Y
+        Top = Y
     End Function
 
     Function Right() As Long
-        Return X + Width
+        Right = X + Width
     End Function
 
     Function Bottom() As Long
-        Return Y + Height
+        Bottom = Y + Height
     End Function
 
@@ -110 +104 @@
     End Function
 
-    Function Operator == (rc As Rectangle) As Boolean
+    Function Operator ==(rc As Rectangle) As Boolean
         Return Equals(rc)
     End Function
 
-    Function Operator <> (rc As Rectangle) As Boolean
+    Function Operator <>(rc As Rectangle) As Boolean
         Return (Not Equals(rc))
     End Function
@@ -206 +200 @@
     Static Function Ceiling(rcf As RectangleF) As Rectangle
         Dim r As Rectangle(
-            System.Math.Ceiling(rcf.X) As Long,
-            System.Math.Ceiling(rcf.Y) As Long,
-            System.Math.Ceiling(rcf.Width) As Long,
-            System.Math.Ceiling(rcf.Height) As Long)
+            Math.Ceiling(rcf.X) As Long,
+            Math.Ceiling(rcf.Y) As Long,
+            Math.Ceiling(rcf.Width) As Long,
+            Math.Ceiling(rcf.Height) As Long)
         Return r
     End Function
@@ -215 +209 @@
     Static Function Round(rcf As RectangleF) As Rectangle
         Dim r As Rectangle(
-            System.Math.Round(rcf.X) As Long,
-            System.Math.Round(rcf.Y) As Long,
-            System.Math.Round(rcf.Width) As Long,
-            System.Math.Round(rcf.Height) As Long)
+            Math.Round(rcf.X) As Long,
+            Math.Round(rcf.Y) As Long,
+            Math.Round(rcf.Width) As Long,
+            Math.Round(rcf.Height) As Long)
         Return r
     End Function
@@ -224 +218 @@
     Static Function Truncate(rcf As RectangleF) As Rectangle
         Dim r As Rectangle(
-            System.Math.Truncate(rcf.X) As Long,
-            System.Math.Truncate(rcf.Y) As Long,
-            System.Math.Truncate(rcf.Width) As Long,
-            System.Math.Truncate(rcf.Height) As Long)
+            Math.Truncate(rcf.X) As Long,
+            Math.Truncate(rcf.Y) As Long,
+            Math.Truncate(rcf.Width) As Long,
+            Math.Truncate(rcf.Height) As Long)
         Return r
     End Function
@@ -247 +241 @@
 End Class
 
-#endif '__SYSTEM_DRAWING_RECTFANGLE_AB__
+End Namespace
+End Namespace