Changeset 473 for trunk/Include/Classes/System/Windows

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/Include/Classes/System/Windows/Forms/Control.ab (modified) (6 diffs)

trunk/Include/Classes/System/Windows/Forms/Control.ab

@@ -113 +113 @@
     End Sub
 
-    Const Function Bounds() As Rectangle
+    Const Function Bounds() As Drawing.Rectangle
         Dim wr As RECT
         wr = wnd.WindowRect
-        Dim r = New Rectangle(wr)
+        Dim r = New Drawing.Rectangle(wr)
         Dim parent = Parent
         If Object.ReferenceEquals(parent, Nothing) Then
-            Return parent->RectangleToClient(r)
+            Return parent.RectangleToClient(r)
         Else
             Return r
@@ -129 +129 @@
     End Sub
 */
-    Const Function Location() As Point
+    Const Function Location() As Drawing.Point
         Return Bounds.Location
     End Function
@@ -137 +137 @@
     End Sub
 */
-    Const Function Size() As Size
+    Const Function Size() As Drawing.Size
         Return Bounds.Size
     End Function
@@ -213 +213 @@
     End Function
 */
-    Const Function RectangleToScreen(r As Rectangle) As Rectangle
+    Const Function RectangleToScreen(r As Drawing.Rectangle) As Drawing.Rectangle
         Dim rc = r.ToRECT
         wnd.ClientToScreen(rc)
-        Return New Rectangle(rc)
-    End Function
-
-    Const Function RectangleToClient(r As Rectangle) As Rectangle
+        Return New Drawing.Rectangle(rc)
+    End Function
+
+    Const Function RectangleToClient(r As Drawing.Rectangle) As Drawing.Rectangle
         Dim rc = r.ToRECT()
         wnd.ScreenToClient(rc)
-        Return New Rectangle(rc)
+        Return New Drawing.Rectangle(rc)
     End Function
 
@@ -405 +405 @@
 '   Virtual Function DefaultCursor() As Cursor
 
-    Virtual Function DefaultSize() As Size
-        Return New Size(300, 300)
+    Virtual Function DefaultSize() As Drawing.Size
+        Return New Drawing.Size(300, 300)
     End Function
 
@@ -543 +543 @@
     End Sub
 
-    Virtual Sub NotifyInvalidate(r As Rectangle)
+    Virtual Sub NotifyInvalidate(r As Drawing.Rectangle)
         Dim rc As RECT
         rc = r.ToRECT()