Changeset 240 for Include

Timestamp:

May 9, 2007, 9:43:24 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Control周りの修正

Location:

Include/Classes/System/Windows/Forms

Files:

• Control.ab (modified) (16 diffs)
• CreateParams.ab (modified) (1 diff)
• Message.ab (modified) (2 diffs)

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

@@ -28 +28 @@
     End Sub
 
-    Override Function AsyncState() As IObject
+    Override Function AsyncState() As Object
         Return Nothing
     End Function
@@ -36 +36 @@
     End Function
 
-    Override Function CompletedSynchronously() As BOOL
+    Override Function CompletedSynchronously() As Boolean
         Return FALSE
     End Function
 
-    Override Function IsCompleted() As BOOL
-        Return waitHandle.WaitOne(0, FALSE)
+    Override Function IsCompleted() As Boolean
+        Return waitHandle.WaitOne(0, False)
     End Function
 
@@ -69 +69 @@
     '---------------------------------------------------------------------------
     ' Public Properties
-
     Function AllowDrop() As Boolean
     End Function
@@ -93 +92 @@
     End Function
 
-    Sub Text(ByRef t As String)
+    Sub Text(t As String)
         text = t
         Dim e As EventArgs
@@ -185 +184 @@
 
     Const Function Right() As Long
-        Return Left + Width
+        Dim b = Bounds
+        Return b.Left + b.Width
     End Function
 
     Const Function Bottom() As Long
-        Return Top + Height
+        Dim b = Bounds
+        Return b.Top + b.Height
     End Function
 
@@ -266 +267 @@
         This.text = text
         bkColor = DefaultBackColor
-'       Debug
-        CreateHandle()
     End Sub
 
@@ -279 +278 @@
 
     Virtual Sub ~Control()
-        If wnd.IsWindow Then
-            wnd.Destroy() ' 暫定
+        If Not Object.ReferenceEquals(wnd, Nothing) Then
+            If wnd.IsWindow Then
+                wnd.Destroy() ' 暫定
+            End If
         End If
     End Sub
@@ -358 +359 @@
     End Sub
 
+    Sub CreateControl()
+        CreateHandle() '暫定
+    End Sub
+
 Protected
+
     '---------------------------------------------------------------------------
     ' Protected Properties
@@ -365 +371 @@
         Return createParams
     End Function
-
 '   Virtual Function DefaultCursor() As Cursor
 
@@ -377 +382 @@
 
 '   Const Virtual Function Cursor() As Cursor
-'   Virtual Sub Cursor(ByRef c As Cursor)
+'   Virtual Sub Cursor(c As Cursor)
 
     '---------------------------------------------------------------------------
@@ -385 +390 @@
         Dim gch = GCHandle.Alloc(This)
         TlsSetValue(tlsIndex, GCHandle.ToIntPtr(gch) As VoidPtr)
-        With createParams[0]
+        With createParams
             Dim hwndParent = 0 As HWND
             If Not Object.ReferenceEquals(parent, Nothing) Then
                 hwndParent = parent.Handle
             End If
-            If CreateWindowEx(.ExStyle, atom As ULONG_PTR As PCSTR, text, .Style, _
+            Dim pText As PCTSTR
+            If String.IsNullOrEmpty(text) Then
+                pText = "" As PCTSTR
+            Else
+                pText = ToTCStr(text)
+            End If
+
+            If CreateWindowEx(.ExStyle, atom As ULONG_PTR As PCSTR, pText, .Style, _
                 CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, _
                 hwndParent, 0, hInstance, 0) = 0 Then
@@ -437 +449 @@
                 Case WM_CREATE
                     OnHandleCreated(EventArgs.Empty)
+                Case WM_DESTROY
+                    OnHandleDestroyed(EventArgs.Empty)
                 Case Else
                     DefWndProc(m)
@@ -487 +501 @@
     Virtual Sub OnBackColorChanged(e As EventArgs) : End Sub
     Virtual Sub OnHandleCreated(e As EventArgs) : End Sub
+    Virtual Sub OnHandleDestroyed(e As EventArgs) : End Sub
     Virtual Sub OnTextChanged(e As EventArgs)
         wnd.SetText(ToTCStr(text))
@@ -527 +542 @@
             .hbrBackground = 0
             .lpszMenuName = 0
-            .lpszClassName = WindowClassName
+            .lpszClassName = ToTCStr(WindowClassName)
             .hIconSm = 0
         End With
@@ -565 +580 @@
                 ' あってはならない事態
                 Debug
-                ExitThread(0)
+                ExitThread(-1)
             End If
-'           Debug
             rThis.wnd = New WindowHandle(hwnd)
             SetWindowLongPtr(hwnd, GWLP_THIS, gchValue)
         End If
-        Dim m As Message
-        m = Message.Create(hwnd, msg, wp, lp)
+
+        Dim m = Message.Create(hwnd, msg, wp, lp)
         rThis.WndProc(m)
         Return m.Result
@@ -605 +619 @@
 
 #endif '__SYSTEM_WINDOWS_FORMS_CONTROL_AB__
+

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

@@ -13 +13 @@
     X As Long
     Y As Long
-    Widht As Long
+    Width As Long
     Height As Long
     Parent As HWND

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

@@ -70 +70 @@
 
     Static Function Create(hwnd As HWND, msg As DWord, wp As WPARAM, lp As LPARAM) As Message
-        Dim m As Message
-        With m
+        Create = New Message
+        With Create
             .hwnd = hwnd
             .msg = msg
@@ -77 +77 @@
             .lp = lp
         End With
-        Return m
     End Function