Changeset 559 for trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Control.ab

Timestamp:

Jul 21, 2008, 1:26:05 AM (16 years ago)

Author:

イグトランス (egtra)

Message:

UI_Sampleの追加。イベントのコメントアウト解除。Form.abからテスト部分を除去。Application.DoEventsを実装。MakeControlEventHandlerを静的メンバのイベント対応へ。WindowsExceptionの追加。

File:

• trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Control.ab (modified) (6 diffs)

trunk/ab5.0/ablib/src/Classes/ActiveBasic/Windows/UI/Control.ab

@@ -91 +91 @@
         Imports System.Runtime.InteropServices
 
+        If hwnd <> 0 Then
+            Throw New System.InvalidOperationException("Window already created.")
+        End If
+
         Dim gch = GCHandle.Alloc(This)
         TlsSetValue(tlsIndex, GCHandle.ToIntPtr(gch) As VoidPtr)
@@ -101 +105 @@
                 .x, .y, .cx, .cy, .hwndParent, .hMenu, .hInstance, .lpCreateParams)
             If hwnd = 0 Then
+                Debug
                 ActiveBasic.Windows.ThrowByWindowsError(GetLastError())
             End If
@@ -251 +256 @@
 
     Sub OnCreateBase(sender As Object, e As MessageArgs)
-'       OnCreate(New CreateArgs(e.LParam As *CREATESTRUCT))
+        OnCreate(New CreateArgs(e.LParam As *CREATESTRUCT))
     End Sub
 
@@ -333 +338 @@
             ' ウィンドウが作られて最初にWndProcFirstが呼ばれたとき
 
-            If AssociateHWnd(gch, hwnd) = False Then
-                Goto *InstanceIsNotFound
-            End If
+            AssociateHWnd(gch, hwnd)
         End If
         If msg = WM_NCDESTROY Then
@@ -349 +352 @@
 
     *InstanceIsNotFound
-        OutputDebugString(Ex"ActiveBasic.Windows.UI.Control.WndProcFirst: The attached instance is not found.\r\n")
+        Dim err = "ActiveBasic.Windows.UI.Control.WndProcFirst: The attached instance is not found. msg = &h" _
+            + Hex$(msg) + Ex"\r\n"
+        OutputDebugString(ToTCStr(err))
         WndProcFirst = DefWindowProc(hwnd, msg, wp, lp)
     End Function
@@ -360 +365 @@
     これを実行することで、UnassociateHWndされるまでControlがGC対象にならなくなる。
     */
-    Static Function AssociateHWnd(gch As System.Runtime.InteropServices.GCHandle, hwnd As HWND) As Boolean
+    Static Sub AssociateHWnd(gch As System.Runtime.InteropServices.GCHandle, hwnd As HWND)
         Imports System.Runtime.InteropServices
         Dim rThis = gch.Target As Control
         If IsNothing(rThis) Then
-            Exit Function
+            Exit Sub
         End If
         rThis.hwnd = hwnd
         rThis.Prop[PropertyInstance] = GCHandle.ToIntPtr(gch) As HANDLE
-    End Function
+    End Sub
 
     /*!