Changeset 282 for Include/Classes/System/Windows/Forms/Control.ab

Timestamp:

Jul 2, 2007, 1:33:52 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

#121対応、Classes/System/Windows/Forms以下を名前空間に入れた。

File:

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

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

@@ -17 +17 @@
 #require <Classes/System/Drawing/Rectangle.ab>
 #require <Classes/System/Runtime/InteropServices/GCHandle.ab>
+#require <Classes/ActiveBasic/Strings/Strings.ab>
+
+Namespace System
+Namespace Windows
+Namespace Forms
+
+Namespace Detail
 
 TypeDef InvokeProc = *Function(p As VoidPtr) As VoidPtr
 
 Class AsyncResultForInvoke
-    Inherits IAsyncResult
+    Inherits System.IAsyncResult
 Public
     ' Properties
@@ -32 +39 @@
     End Function
 
-    Override Function AsyncWaitHandle() As WaitHandle
+    Override Function AsyncWaitHandle() As System.Threading.WaitHandle
         Return waitHandle
     End Function
@@ -53 +60 @@
 
 Private
-    waitHandle As WaitHandle
+    waitHandle As System.Threading.WaitHandle
     result As VoidPtr
 End Class
@@ -63 +70 @@
     AsyncResult As AsyncResultForInvoke
 End Class
+
+End Namespace 'Detail
 
 Class Control
@@ -290 +299 @@
     ' 同期関数呼出、Controlが作成されたスレッドで関数を実行する。
     ' 関数は同期的に呼び出されるので、関数が終わるまでInvokeは制御を戻さない。
-    Function Invoke(pfn As InvokeProc, p As VoidPtr) As VoidPtr
+    Function Invoke(pfn As System.Windows.Forms.Detail.InvokeProc, p As VoidPtr) As VoidPtr
         Return wnd.SendMessage(WM_CONTROL_INVOKE, p As WPARAM, pfn As LPARAM) As VoidPtr
     End Function
@@ -297 +306 @@
     ' 関数は非同期的に呼び出されるので、BeginInvokeはすぐに制御を戻す。
     ' 後にEndInvokeを呼び出すことにより、関数の戻り値を受け取れる。
-    Function BeginInvoke(pfn As InvokeProc, p As VoidPtr) As IAsyncResult
+    Function BeginInvoke(pfn As System.Windows.Forms.Detail.InvokeProc, p As VoidPtr) As System.IAsyncResult
         ' EndInvokeがDeleteする
-        Dim asyncResult = New AsyncResultForInvoke(CreateEvent(0, FALSE, FALSE, 0))
+        Dim asyncResult = New System.Windows.Forms.Detail.AsyncResultForInvoke(CreateEvent(0, FALSE, FALSE, 0))
         ' OnControlBeginInvokeがDeleteする
-        Dim asyncInvokeData = New AsyncInvokeData
+        Dim asyncInvokeData = New System.Windows.Forms.Detail.AsyncInvokeData
         With asyncInvokeData
             .FuncPtr = pfn
@@ -307 +316 @@
             .AsyncResult = asyncResult
         End With
-        Dim gch = GCHandle.Alloc(asyncInvokeData)
-        wnd.PostMessage(WM_CONTROL_BEGININVOKE, 0, GCHandle.ToIntPtr(gch))
+        Dim gch = System.Runtime.InteropServices.GCHandle.Alloc(asyncInvokeData)
+        wnd.PostMessage(WM_CONTROL_BEGININVOKE, 0, System.Runtime.InteropServices.GCHandle.ToIntPtr(gch))
         Return pAsyncResult
     End Function
@@ -314 +323 @@
     ' BeginInvokeで呼び出した関数の戻り値を受け取る。
     ' その関数がまだ終了していない場合、終了するまで待機する。
-    Function EndInvoke(ar As IAsyncResult) As VoidPtr
+    Function EndInvoke(ar As System.IAsyncResult) As VoidPtr
         ar.WaitHandle.WaitOne()
-        Dim arInvoke = ar As AsyncResultForInvoke
+        Dim arInvoke = ar As System.Windows.Forms.Detail.AsyncResultForInvoke
         Return arInvoke.Result
     End Function
@@ -327 +336 @@
         If IsWindow(hwnd) Then
             If GetClassLongPtr(hwnd, GCW_ATOM) = atom Then
-                Dim gch = GCHandle.FromIntPtr(GetWindowLongPtr(hwnd, GWLP_THIS))
+                Dim gch = System.Runtime.InteropServices.GCHandle.FromIntPtr(GetWindowLongPtr(hwnd, GWLP_THIS))
                 Return gch.Target As Control
             End If
@@ -424 +433 @@
             Select Case .Msg
                 Case WM_GETTEXTLENGTH
-                    .Result = text.Length
+                    .Result = text.Length 'ToDo: Unicode対応
                 Case WM_GETTEXT
-                    Dim size = Math.Min(.WParam As ULONG_PTR, (text.Length + 1) As ULONG_PTR)
-                    memcpy(.LParam As PCTSTR, ToTCStr(text), size * SizeOf (TCHAR))
+                    Dim size = System.Math.Min(.WParam As SIZE_T, (text.Length + 1) As SIZE_T)
+                    ActiveBasic.Strings.ChrCopy(.LParam As PCTSTR, ToTCStr(text), size)
                     .Result = size
                 Case WM_SETTEXT
                     text = New String(.LParam As PCTSTR)
                 Case WM_ENABLE
-                    OnEnabledChanged(EventArgs.Empty)
+                    OnEnabledChanged(System.EventArgs.Empty)
                 Case WM_ERASEBKGND
                     ' OnPaintBackgroundに移すべき
@@ -443 +452 @@
                     DeleteObject(hbr)
                 Case WM_CONTROL_INVOKE
-                    Dim pfn = .LParam As InvokeProc
+                    Dim pfn = .LParam As System.Windows.Forms.Detail.InvokeProc
                     .Result = pfn(m.WParam As VoidPtr) As LRESULT
                 Case WM_CONTROL_BEGININVOKE
                     OnControlBeginInvoke(m)
                 Case WM_CREATE
-                    OnHandleCreated(EventArgs.Empty)
+                    OnHandleCreated(System.EventArgs.Empty)
                 Case WM_DESTROY
-                    OnHandleDestroyed(EventArgs.Empty)
+                    OnHandleDestroyed(System.EventArgs.Empty)
                 Case Else
                     DefWndProc(m)
@@ -498 +507 @@
 
     Virtual Sub OnPaintBackground(e As PaintEventArgs) : End Sub
-    Virtual Sub OnEnabledChanged(e As EventArgs) : End Sub
-    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)
+    Virtual Sub OnEnabledChanged(e As System.EventArgs) : End Sub
+    Virtual Sub OnBackColorChanged(e As System.EventArgs) : End Sub
+    Virtual Sub OnHandleCreated(e As System.EventArgs) : End Sub
+    Virtual Sub OnHandleDestroyed(e As System.EventArgs) : End Sub
+    Virtual Sub OnTextChanged(e As System.EventArgs)
         wnd.SetText(ToTCStr(text))
     End Sub
@@ -574 +583 @@
         If Object.ReferenceEquals(rThis As Object, Nothing) Then
             Dim gchValue = TlsGetValue(tlsIndex) As LONG_PTR
-            Dim gch = GCHandle.FromIntPtr(gchValue)
+            Dim gch = System.Runtime.InteropServices.GCHandle.FromIntPtr(gchValue)
             rThis = gch.Target As Control
             ' ウィンドウが作られて最初にWndProcFirstが呼ばれたとき
@@ -593 +602 @@
     ' BeginInvokeが呼ばれたときの処理
     Sub OnControlBeginInvoke(m As Message)
-        Dim gch = GCHandle.FromIntPtr(m.LParam)
-        Dim data = gch.Target As AsyncInvokeData
+        Dim gch = System.Runtime.InteropServices.GCHandle.FromIntPtr(m.LParam)
+        Dim data = gch.Target As System.Windows.Forms.Detail.AsyncInvokeData
         With data
             Dim pfn = .FuncPtr
@@ -603 +612 @@
 End Class
 
+Namespace Detail
 Class _System_ControlIinitializer
 Public
     Sub _System_ControlIinitializer(hinst As HINSTANCE)
-        Control.Initialize(hinst)
+        System.Windows.Forms.Control.Initialize(hinst)
     End Sub
 
     Sub ~_System_ControlIinitializer()
-        Control.Uninitialize()
+        System.Windows.Forms.Control.Uninitialize()
     End Sub
 End Class
@@ -618 +628 @@
 #endif '_SYSTEM_NO_INITIALIZE_CONTROL_
 
+End Namespace
+
+End Namespace 'Forms
+End Namespace 'Widnows
+End Namespace 'System
+
 #endif '__SYSTEM_WINDOWS_FORMS_CONTROL_AB__