Changeset 282 for Include/Classes/System/Windows

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

Include/Classes/System/Windows/Forms

Files:

• Control.ab (modified) (16 diffs)
• CreateParams.ab (modified) (2 diffs)
• Message.ab (modified) (2 diffs)
• PaintEventArgs.ab (modified) (1 diff)
• misc.ab (modified) (2 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__
 

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

@@ -3 +3 @@
 #ifndef __SYSTEM_WINDOWS_FORMS_CREATEPARAMS_AB__
 #define __SYSTEM_WINDOWS_FORMS_CREATEPARAMS_AB__
+
+Namespace System
+Namespace Windows
+Namespace Forms
 
 Class CreateParams
@@ -19 +23 @@
 End Class
 
+End Namespace 'Forms
+End Namespace 'Widnows
+End Namespace 'System
+
 #endif '__SYSTEM_WINDOWS_FORMS_CREATEPARAMS_AB__

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

@@ -5 +5 @@
 
 #require <windows.sbp>
+
+Namespace System
+Namespace Windows
+Namespace Forms
 
 Class Message
@@ -87 +91 @@
 End Class
 
+End Namespace 'Forms
+End Namespace 'Widnows
+End Namespace 'System
+
 #endif '__SYSTEM_WINDOWS_FORMS_MESSAGE_AB__

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

@@ -6 +6 @@
 #require <Classes/System/misc.ab>
 
+Namespace System
+Namespace Windows
+Namespace Forms
+
 Class PaintEventArgs
-    Inherits EventArgs
+    Inherits System.EventArgs
 End Class
 
+End Namespace 'Forms
+End Namespace 'Widnows
+End Namespace 'System
+
 #endif '__SYSTEM_WINDOWS_FORMS_PAINTEVENTARGS_AB__

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

@@ -3 +3 @@
 #ifndef __SYSTEM_WINDOWS_FORMS_MISC_AB__
 #define __SYSTEM_WINDOWS_FORMS_MISC_AB__
+
+Namespace System
+Namespace Windows
+Namespace Forms
 
 Interface IWin32Window
@@ -19 +23 @@
 End Enum
 
+Enum Keys
+    LButton = VK_LBUTTON
+    RButton = VK_RBUTTON
+    Cancel = VK_CANCEL
+    MButton = VK_MBUTTON
+    XButton1 = VK_XBUTTON1
+    XButton2 = VK_XBUTTON2
+    Back = VK_BACK
+    Tab = VK_TAB
+    Clear = VK_CLEAR
+    Return_ = VK_RETURN
+    Shift = VK_SHIFT
+    Control = VK_CONTROL
+    Menu = VK_MENU
+    Pause = VK_PAUSE
+    Capital = VK_CAPITAL
+    KanaMode = VK_KANA
+    HangulMode = VK_HANGUL
+    JunjaMode = VK_JUNJA
+    FinalMode = VK_FINAL
+    HanjaMode = VK_HANJA
+    KanjiMode = VK_KANJI
+    Escape = VK_ESCAPE
+    IMEConvert = VK_CONVERT
+    IMENonconvert = VK_NONCONVERT
+    IMEAccept = VK_ACCEPT
+    IMEModeChange = VK_MODECHANGE
+    Space = VK_SPACE
+    PageUp = VK_PRIOR
+    PageDown = VK_NEXT
+    End_ = VK_END
+    Home = VK_HOME
+    Left = VK_LEFT
+    Up = VK_UP
+    Right = VK_RIGHT
+    Down = VK_DOWN
+    Select_ = VK_SELECT
+    Print = VK_PRINT
+    Execute = VK_EXECUTE
+    Snapshot = VK_SNAPSHOT
+    Insert = VK_INSERT
+    Delete_ = VK_DELETE
+    Help = VK_HELP
+    D0 = &h30
+    D1 = &h31
+    D2 = &h32
+    D3 = &h33
+    D4 = &h34
+    D5 = &h35
+    D6 = &h36
+    D7 = &h37
+    D8 = &h38
+    D9 = &h39
+    A = &h41
+    B = &h42
+    C = &h43
+    D = &h44
+    E = &h45
+    F = &h46
+    G = &h47
+    H = &h48
+    I = &h49
+    J = &h4a
+    K = &h4b
+    L = &h4c
+    M = &h4d
+    N = &h4e
+    O = &h4f
+    P = &h50
+    Q = &h51
+    R = &h52
+    S = &h53
+    T = &h54
+    U = &h55
+    V = &h56
+    W = &h57
+    X = &h58
+    Y = &h59
+    Z = &h5A
+    LWin = VK_LWIN
+    RWin = VK_RWIN
+    Apps = VK_APPS
+    Sleep = VK_SLEEP
+    NumPad0 = VK_NUMPAD0
+    NumPad1 = VK_NUMPAD1
+    NumPad2 = VK_NUMPAD2
+    NumPad3 = VK_NUMPAD3
+    NumPad4 = VK_NUMPAD4
+    NumPad5 = VK_NUMPAD5
+    NumPad6 = VK_NUMPAD6
+    NumPad7 = VK_NUMPAD7
+    NumPad8 = VK_NUMPAD8
+    NumPad9 = VK_NUMPAD9
+    Multiply = VK_MULTIPLY
+    Add = VK_ADD
+    Separator = VK_SEPARATOR
+    Substract = VK_SUBTRACT
+    Decimal = VK_DECIMAL
+    Divide = VK_DIVIDE
+    F1 = VK_F1
+    F2 = VK_F2
+    F3 = VK_F3
+    F4 = VK_F4
+    F5 = VK_F5
+    F6 = VK_F6
+    F7 = VK_F7
+    F8 = VK_F8
+    F9 = VK_F9
+    F10 = VK_F10
+    F11 = VK_F11
+    F12 = VK_F12
+    F13 = VK_F13
+    F14 = VK_F14
+    F15 = VK_F15
+    F16 = VK_F16
+    F17 = VK_F17
+    F18 = VK_F18
+    F19 = VK_F19
+    F20 = VK_F20
+    F21 = VK_F21
+    F22 = VK_F22
+    F23 = VK_F23
+    F24 = VK_F24
+    NumLock = VK_NUMLOCK
+    Scroll = VK_SCROLL
+    LShiftKey = VK_LSHIFT
+    RShiftKey = VK_RSHIFT
+    LControlKey = VK_LCONTROL
+    RControlKey = VK_RCONTROL
+    LMenu = VK_LMENU
+    RMenu = VK_RMENU
+    BrowserBack = VK_BROWSER_BACK
+    BrowserForward = VK_BROWSER_FORWARD
+    BrowserRefresh = VK_BROWSER_REFRESH
+    BrowserStop = VK_BROWSER_STOP
+    BrowserSearch = VK_BROWSER_SEARCH
+    BrowserFavorites = VK_BROWSER_FAVORITES
+    BrowserHome = VK_BROWSER_HOME
+    VolumeMute = VK_VOLUME_MUTE
+    VolumeDown = VK_VOLUME_DOWN
+    VolumeUp = VK_VOLUME_UP
+    MediaNextTrack = VK_MEDIA_NEXT_TRACK
+    MediaPreviousTrack = VK_MEDIA_PREV_TRACK
+    MediaStop = VK_MEDIA_STOP
+    MediaPlayPause = VK_MEDIA_PLAY_PAUSE
+    LaunchMail = VK_LAUNCH_MAIL
+    SelectMedia = VK_LAUNCH_MEDIA_SELECT
+    LaunchApplication1 = VK_LAUNCH_APP1
+    LaunchApplication2 = VK_LAUNCH_APP2
+    Oem1 = VK_OEM_1
+    Oemplus = VK_OEM_PLUS
+    Oemcomma = VK_OEM_COMMA
+    OemMinus = VK_OEM_MINUS
+    OemPeriod = VK_OEM_PERIOD
+    Oem2 = VK_OEM_2
+    Oem3 = VK_OEM_3
+    Oem4 = VK_OEM_4
+    Oem5 = VK_OEM_5
+    Oem6 = VK_OEM_6
+    Oem7 = VK_OEM_7
+    Oem8 = VK_OEM_8
+    Oem102 = VK_OEM_102
+    ProcessKey = VK_PROCESSKEY
+    Packet = VK_PACKET
+    Attn = VK_ATTN
+    Crsel = VK_CRSEL
+    Exsel = VK_EXSEL
+    EraseEof = VK_EREOF
+    Play = VK_PLAY
+    Zoom = VK_ZOOM
+    Pa1 = VK_PA1
+    OemClear = VK_OEM_CLEAR
+End Enum
+
+End Namespace 'Forms
+End Namespace 'Widnows
+End Namespace 'System
+
 #endif '__SYSTEM_WINDOWS_FORMS_MISC_AB__