Changeset 132 for Include/Classes/System/Windows/Forms

Timestamp:

Mar 4, 2007, 11:28:44 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

String型の自身を変更するメソッドを、戻り値で返すように変更。
併せて文字列比較を自前の関数で行うように変更。
プロンプトのキャレットの位置計算が正しくなかったバグを修正。

File:

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

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

@@ -56 +56 @@
 Class AsyncInvokeData
 Public
-    FuncPtr As *Function(p As VoidPtr) As VoidPtr, p As VoidPtr
+    FuncPtr As *Function(p As VoidPtr) As VoidPtr
     Data As *VoidPtr
     AsyncResult As *AsyncResultForInvoke
@@ -64 +64 @@
     Inherits IWin32Window
 Public
-    ' Properties
+    '---------------------------------------------------------------------------
+    ' Public Properties
 
     Function AllowDrop() As BOOL
@@ -223 +224 @@
     End Sub
 
+    Function Parent() As *Control
+        Return parent
+    End Function
+
+    Static Function DefaultBackColor() As Color
+        Return Color.FromArgb(255, 255, 255)
+    End Function
+
+    '---------------------------------------------------------------------------
     ' Constractors
 
@@ -240 +250 @@
     End Sub
 
-    Sub Control(text As String, left As Long, top As Long, width As Long, height As Long)
+    Sub Control(ByRef text As String, left As Long, top As Long, width As Long, height As Long)
         This.text = text
         bkColor = DefaultBackColor
@@ -252 +262 @@
     End Sub
 
-    Function Parent() As *Control
-        Return parent
-    End Function
-
-    Static Function DefaultBackColor() As Color
-        Return Color.FromArgb(255, 255, 255)
-    End Function
-
+    '---------------------------------------------------------------------------
     ' Destractor
 
@@ -268 +271 @@
     End Sub
 
-    ' Methods
+    '---------------------------------------------------------------------------
+    ' Public Methods
 
     ' 同期関数呼出、Controlが作成されたスレッドで関数を実行する。
@@ -345 +349 @@
 
 Protected
-    ' Properties
+    '---------------------------------------------------------------------------
+    ' Protected Properties
 '   Const Virtual Function CanRaiseEvents() As BOOL
     Virtual Function CreateParams() As *CreateParams
@@ -364 +369 @@
 '   Virtual Sub Cursor(ByRef c As Cursor)
 
-    ' Methods
+    '---------------------------------------------------------------------------
+    ' Protected Methods
     Virtual Sub CreateHandle()
         Dim createParams = CreateParams()
@@ -406 +412 @@
                 Case WM_ERASEBKGND
                     ' OnPaintBackgroundに移すべき
-                    Dim hdc As HDC
-                    hdc = .WParam As HDC
+                    Dim hdc = .WParam As HDC
                     Dim hbr = CreateSolidBrush(bkColor.ToCOLORREF())
                     Dim hbrOld = SelectObject(hdc, hbr)
-                    Dim rc As RECT
-                    rc = wnd.ClientRect
+                    Dim rc = wnd.ClientRect
                     Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom)
                     SelectObject(hdc, hbrOld)