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

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

@@ -1 +1 @@
 ' Classes/System/Drawing/Size.ab
 
-#ifndef __SYSTEM_DRAWING_SIZE_AB__
-#define __SYSTEM_DRAWING_SIZE_AB__
-
-'#include <Classes/System/Math.ab>
-#include <Classes/System/Drawing/SizeF.ab>
+Namespace System
+Namespace Drawing
 
 Class Size
@@ -41 +38 @@
 
     Function Operator +(sz As Size) As Size
-        Dim ret As Size(width + sz.width, height + sz.height)
-        Return ret
+        Return New Size(width + sz.width, height + sz.height)
     End Function
 
     Function Operator -(sz As Size) As Size
-        Dim ret As Size(width - sz.width, height - sz.height)
-        Return ret
+        Return New Size(width - sz.width, height - sz.height)
     End Function
 
     Function Operator () As SizeF
-        Dim szf As SizeF(width, height)
-        Return szf
+        Return New SizeF(width, height)
     End Function
 
@@ -62 +56 @@
         Return Not Equals(sz)
     End Function
-/*
-    Sub Operator =(ByRef sz As Size)
-        width = sz.width
-        height = sz.height
-    End Sub
-*/
+
     Function Equals(sz As Size) As Boolean
         If width = sz.width And height = sz.height Then
@@ -93 +82 @@
 
     Static Function Ceiling(szf As SizeF) As Size
-        Dim sz As Size(System.Math.Ceiling(szf.Width) As Long, System.Math.Ceiling(szf.Height) As Long)
-        Return sz
+        Return New Size(System.Math.Ceiling(szf.Width) As Long, System.Math.Ceiling(szf.Height) As Long)
     End Function
 
     Static Function Round(szf As SizeF) As Size
-        Dim sz As Size(System.Math.Round(szf.Width) As Long, System.Math.Round(szf.Height) As Long)
-        Return sz
+        Return New Size(System.Math.Round(szf.Width) As Long, System.Math.Round(szf.Height) As Long)
     End Function
 
     Static Function Truncate(szf As SizeF) As Size
-        Dim sz As Size(System.Math.Truncate(szf.Width) As Long, System.Math.Truncate(szf.Height) As Long)
-        Return sz
+        Return New Size(System.Math.Truncate(szf.Width) As Long, System.Math.Truncate(szf.Height) As Long)
     End Function
 
@@ -112 +98 @@
 End Class
 
-#endif '__SYSTEM_DRAWING_SIZE_AB__
+End Namespace
+End Namespace