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

Timestamp:

Oct 18, 2008, 5:55:42 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

WindowHandleをWindows.UIの一部として使うために改造。メンバ関数の厳選、例外処理の導入など。

File:

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

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

@@ -37 +37 @@
     @brief HWNDからControlインスタンスを取得する。
     @param[in] hwnd 対象のウィンドウハンドル
-    @return 対応するControlインスタンス。ただし、存在しなければNothing。
+    @return 対応するControlインスタンス。存在しなければ作成される。ただし、hwndがNULLならNothing。
     */
     Static Function FromHWnd(hwnd As HWND) As Control
         FromHWnd = Nothing
-        If _System_IsWindow(hwnd) Then
+        If IsWindow(hwnd) Then
             FromHWnd = FromHWndCore(hwnd)
+            If ActiveBasic.IsNothing(FromHWnd) Then
+                Dim lock = New ActiveBasic.Windows.CriticalSectionLock(_System_CriticalSection)
+                Try
+                    FromHWnd = New Control
+                    FromHWnd.registerStandardEvent()
+                    FromHWnd.AssociateHWnd(hwnd)
+                Finally
+                    lock.Dispose()
+                End Try
+            End If
         End If
     End Function
@@ -104 +114 @@
 
 Protected
-    Abstract Sub GetCreateStruct(ByRef cs As CREATESTRUCT)
+    Virtual Sub GetCreateStruct(ByRef cs As CREATESTRUCT)
+    End Sub
 
     Sub createImpl(ByRef cs As CREATESTRUCT, parent As Control)
@@ -131 +142 @@
 
 Public
+/*
     Sub Attach(hwndNew As HWND)
         throwIfAlreadyCreated()
@@ -139 +151 @@
         AssociateHWnd(hwndNew)
     End Sub
-
+*/
     Sub BeginSubclass()
         throwIfNotCreated()
-        prevWndProc = SetWindowLongPtr(GWLP_WNDPROC, AddressOf(WndProcFirst) As LONG_PTR) As WNDPROC
+        prevWndProc = SetWindowLongPtr(hwnd, GWLP_WNDPROC, AddressOf(WndProcFirst) As LONG_PTR) As WNDPROC
     End Sub
 
@@ -305 +317 @@
         Else
             Dim ps As PAINTSTRUCT
-            BeginPaint(ps)
+            BeginPaint(hwnd, ps)
             Try
                 OnPaintDC(New PaintDCArgs(ps.hdc, ps.rcPaint))
             Finally
-                EndPaint(ps)
+                EndPaint(hwnd, ps)
             End Try
         End If