Changeset 303 for trunk/Include/Classes


Ignore:
Timestamp:
Aug 24, 2007, 11:14:46 AM (17 years ago)
Author:
イグトランス (egtra)
Message:

フルコンパイルでのミスあぶり出し。註：修正は全て@300や@301以前に行われた。

Location:
trunk/Include/Classes
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Include/Classes/ActiveBasic/Windows/CriticalSection.ab

    r297 r303  
    77
    88Namespace Detail
    9     Const InterlockedExchangeAnyPointer(p, x) = InterlockedExchangePointer(VarPtr(p) As VoidPtr, x)
     9    Const InterlockedExchangeAnyPointer(p, x) = InterlockedExchangePointer(ByVal VarPtr(p) As *VoidPtr, x)
    1010End Namespace
    1111
    … …  
    5353
    5454    /*Override*/ Sub Dispose()
    55         Dim pcs = Detail.InterlockedExchangeAnyPointer(pcs, 0)
    56         If pcs <> 0 Then
    57             LeaveCriticalSection(ByVal pcs)
     55'       Dim p = ActiveBasic.Windows.Detail.InterlockedExchangeAnyPointer(pcs, 0)
     56        Dim p = InterlockedExchangePointer(pcs As VoidPtr, 0) As *CRITICAL_SECTION
     57        If p <> 0 Then
     58            LeaveCriticalSection(ByVal p)
    5859        End If
    5960    End Sub

  • trunk/Include/Classes/ActiveBasic/Windows/WindowHandle.sbp

    r302 r303  
    1 ' Windows/WindowHandle.sbp
    2 
    3 #ifndef __WINDOWS_WINDOWHANDLE_SBP__
    4 #define __WINDOWS_WINDOWHANDLE_SBP__
     1'Classes/ActiveBasic/Windows/WindowHandle.sbp
    52
    63#ifdef _WIN64
    … …  
    1613#endif
    1714Declare Function _System_GetParent Lib "user32" Alias "GetParent" (hWnd As HWND) As HWND
    18 Declare Function _System_SetParent Lib "user32" Alias "SetParent" (hWnd As HWND) As HWND
     15Declare Function _System_SetParent Lib "user32" Alias "SetParent" (hWnd As HWND, hwndParent As HWND) As HWND
    1916Declare Function _System_GetMenu Lib "user32" Alias "GetMenu" (hWnd As HWND) As HMENU
    20 Declare Function _System_SetMenu Lib "user32" Alias "SetMenu" (hWnd As HWND) As HMENU
     17Declare Function _System_SetMenu Lib "user32" Alias "SetMenu" (hWnd As HWND, hmenu As HMENU) As HMENU
    2118Declare Function _System_InvalidateRect Lib "user32" Alias "InvalidateRect" (hWnd As HWND, ByRef Rect As RECT, bErase As BOOL) As BOOL
    2219Declare Function _System_InvalidateRgn Lib "user32" Alias "InvalidateRgn" (hWnd As HWND, hRgn As HRGN, bErase As BOOL) As BOOL
    … …  
    3330Declare Function _System_GetWindowRect Lib "user32" Alias "DrawMenuBar" (hWnd As HWND, ByRef Rect As RECT) As BOOL
    3431Declare Function _System_IsWindow Lib "user32" Alias "IsWindow" (hWnd As HWND) As BOOL
    35 Declare Function _System_Isiconic Lib "user32" Alias "Isiconic" (hWnd As HWND) As BOOL
     32Declare Function _System_IsIconic Lib "user32" Alias "IsIconic" (hWnd As HWND) As BOOL
    3633Declare Function _System_GetClientRect Lib "user32" Alias "GetClientRect" (hWnd As HWND, ByRef Rect As RECT) As BOOL
    3734Declare Function _System_GetProp Lib "user32" Alias _FuncName_GetProp (hWnd As HWND, pString As PCTSTR) As HANDLE
    … …  
    4138Declare Function _System_SetScrollInfo Lib "user32" Alias "SetScrollInfo" (hWnd As HWND, fnBar As Long, ByRef lpsi As SCROLLINFO, bRedraw As Long) As BOOL
    4239Declare Function _System_GetSystemMenu Lib "user32" Alias "GetSystemMenu" (hWnd As HWND, bRevert As BOOL) As HMENU
    43 Declare Function _System_GetDC Lib "gdi32" Alias "GetDC" (hwnd As HWND) As HDC
    44 Declare Function _System_ReleaseDC Lib "gdi32" Alias "ReleaseDC" (hwnd As HWND, hdc As HDC) As BOOL
     40Declare Function _System_GetDC Lib "user32" Alias "GetDC" (hwnd As HWND) As HDC
     41Declare Function _System_GetDCEx Lib "user32" Alias "GetDCEx" (hwnd As HWND, hrgnClip As HRGN, flags As DWord) As HDC
     42Declare Function _System_GetWindowDC Lib "user32" Alias "GetWindowDC" (hwnd As HWND) As HDC
     43Declare Function _System_ReleaseDC Lib "user32" Alias "ReleaseDC" (hwnd As HWND, hdc As HDC) As BOOL
     44Declare Function _System_SendMessage Lib "user32" Alias _FuncName_SendMessage (hwnd As HWND, msg As DWord, wp As WPARAM, lp As LPARAM) As LRESULT
     45Declare Function _System_PostMessage Lib "user32" Alias _FuncName_PostMessage (hwnd As HWND, msg As DWord, wp As WPARAM, lp As LPARAM) As LRESULT
     46Declare Function _System_SendDlgItemMessage Lib "user32" Alias _FuncName_SendDlgItemMessage (hwnd As HWND, id As DWord, msg As DWord, wp As WPARAM, lp As LPARAM) As LRESULT
     47Declare Function _System_GetWindowThreadProcessId Lib "user32" Alias "GetWindowThreadProcessId" (hwnd As HWND, pdwProcessId As *DWord) As DWord
     48
     49Namespace ActiveBasic
     50Namespace Windows
    4551
    4652Class WindowHandle
    … …  
    5561    End Sub
    5662
    57     Sub WindowHandle(wnd As WindowHandle)
    58         hwnd = wnd.hwnd
    59     End Sub
    60 
    61     Sub Operator =(hwndNew As HWND)
    62         hwnd = hwndNew
    63     End Sub
    64 
    6563    Const Function HWnd() As HWND
    6664        Return hwnd
    … …  
    7876        Return _System_BeginPaint(hwnd, ps)
    7977    End Function
    80 
     78/*
    8179    Const Function ChildFromPoint(x As Long, y As Long) As WindowHandle
    8280        Return New WindowHandle(ChildWindowFromPoint(hwnd, x, y))
    … …  
    8684        Return New WindowHandle(ChildWindowFromPointEx(hwnd, x, y, flags))
    8785    End Function
    88 
     86*/
    8987    Const Function ClientToScreen(ByRef pt As POINTAPI) As Boolean
    9088        Return _System_ClientToScreen(hwnd, pt) As Boolean
    … …  
    10199
    102100    Function CreateCaret(hbmp As HBITMAP, width As Long, height As Long) As Boolean
    103         Return _System_CreateCaret(hwnd, hbmp, width, hegiht) As Boolean
     101        Return _System_CreateCaret(hwnd, hbmp, width, height) As Boolean
    104102    End Function
    105103
    … …  
    111109        Return _System_DrawMenuBar(hwnd) As Boolean
    112110    End Function
    113 
     111/*
    114112    Function EnableScrollBar(SBFlags As DWord, arrows As DWord) As Boolean
    115113        Return EnableScrollBar(hwnd, SBFlags, arrows) As Boolean
    116114    End Function
    117 
     115*/
    118116    Function Enable(enable As Boolean) As Boolean
    119117        Return EnableWindow(hwnd, enable) As Boolean
    … …  
    137135
    138136    Const Function GetClassName(className As PTSTR, maxCount As Long) As Long
    139         Return _System_GetClassName(className, maxCount)
     137        Return _System_GetClassName(hwnd, className, maxCount)
    140138    End Function
    141139
    … …  
    143141        Return _System_GetClientRect(hwnd, rc) As Boolean
    144142    End Function
    145 
     143/*
    146144    Const Function GetContextHelpId() As DWord
    147145        Return GetWindowContextHelpId(hwnd)
    148146    End Function
    149 
     147*/
    150148    Function GetDC() As HDC
    151149        Return _System_GetDC(hwnd)
    … …  
    153151
    154152    Function GetDCEx(hrgnClip As HRGN, flags As DWord) As HDC
    155         Return GetDCEx(hwnd, hrgnClip, flags)
    156     End Function
    157 
     153        Return _System_GetDCEx(hwnd, hrgnClip, flags)
     154    End Function
     155/*
    158156    Const Function GetDlgCtrlID() As Long
    159157        Return GetDlgCtrlID(hwnd)
    … …  
    167165        Return GetDlgItemText(hwnd, idDlgItem, ps, maxCount)
    168166    End Function
    169 
     167*/
    170168    Const Function GetMenu() As HMENU
    171169        Return _System_GetMenu(hwnd)
    172170    End Function
    173 
     171/*
    174172    Const Function GetParent() As WindowHandle
    175173        Return New WindowHandle(_System_GetParent(hwnd))
    176174    End Function
    177 
     175*/
    178176    Const Function GetProp(str As String) As HANDLE
    179177        Return _System_GetProp(hwnd, ToTCStr(str))
    … …  
    191189        Return _System_GetScrollInfo(hwnd, fnBar, si) As Boolean
    192190    End Function
    193 
     191/*
    194192    Const Function GetSystemMenu(revert As Boolean) As HMENU
    195193        Return GetSystemMenu(hwnd, revert)
    … …  
    207205        Return GetWindow(hwnd, cmd)
    208206    End Function
    209 
     207*/
    210208    Function GetWindowDC() As HDC
    211         Return GetWindowDC(hwnd)
     209        Return _System_GetWindowDC(hwnd)
    212210    End Function
    213211
    … …  
    215213        Return _System_GetWindowLongPtr(hwnd, index)
    216214    End Function
    217 
     215/*
    218216    Const Function GetWindowPlasement(ByRef wndpl As WINDOWPLACEMENT) As Boolean
    219217        Return GetWindowPlasement(hwnd, wndpl) As Boolean
    220218    End Function
    221 
     219*/
    222220    Const Function GetWindowRect(ByRef rc As RECT) As Boolean
    223         Return _System_GetWindowRect(rc) As Boolean
     221        Return _System_GetWindowRect(hwnd, rc) As Boolean
    224222    End Function
    225223
    226224    Const Function GetText(ps As PTSTR, maxCount As Long) As Boolean
    227         Return GetWindowText(ps, maxCount) As Boolean
     225        Return GetWindowText(hwnd, ps, maxCount) As Boolean
    228226    End Function
    229227
    … …  
    233231
    234232    Const Function GetWindowThreadId() As DWord
    235         Return GetWindowProcessThreadId(hwnd, 0)
    236     End Function
    237 
    238     Const Function GetWindowProcessThreadId(ByRef processId As DWord) As DWord
    239         Return GetWindowProcessThreadId(hwnd, VarPtr(processId))
     233        Return _System_GetWindowThreadProcessId(hwnd, 0)
     234    End Function
     235
     236    Const Function GetWindowThreadProcessId(ByRef processId As DWord) As DWord
     237        Return _System_GetWindowThreadProcessId(hwnd, VarPtr(processId))
    240238    End Function
    241239
    … …  
    267265        Return _System_InvalidateRect(hwnd, ByVal 0, TRUE) As Boolean
    268266    End Function
    269 
     267/*
    270268    Const Function IsChild(hwnd As HWND) As Boolean
    271269        Return IsChild(This.hwnd, hwnd) As Boolean
    … …  
    275273        Return IsDialogMessage(hwnd, msg) As Boolean
    276274    End Function
    277 
     275*/
    278276    Const Function IsIconic() As Boolean
    279277        Return _System_IsIconic(hwnd) As Boolean
    … …  
    295293        Return IsWindowVisible(hwnd) As Boolean
    296294    End Function
    297 
     295/*
    298296    Const Function IsZoomed() As Boolean
    299297        Return IsZoomed(hwnd) As Boolean
    … …  
    303301        Return KillTimer(idEvent) As Boolean
    304302    End Function
    305 
     303*/
    306304    Function LockUpdate() As Boolean
    307305        Return LockWindowUpdate(hwnd) As Boolean
    308306    End Function
    309 
     307/*
    310308    Function MapPoints(hwndTo As HWND, pPoints As *POINTAPI, cPoints As DWord) As Long
    311309        Return MapWindowPoints(hwnd, hwndTo, pPoints, cPoints)
    … …  
    327325        Return MessageBox(hwnd, text, 0, MB_OK)
    328326    End Function
    329 
     327*/
    330328    Function Move(x As Long, y As Long, width As Long, height As Long, repaint As Boolean) As Boolean
    331329        Return MoveWindow(hwnd, x, y, width, height, repaint) As Boolean
    … …  
    336334    End Function
    337335
    338     Function Move(ByRef rc As RECT, repeaint As Boolean) As Boolean
     336    Function Move(ByRef rc As RECT, repaint As Boolean) As Boolean
    339337        With rc
    340338            Return MoveWindow(hwnd, .left, .top, .right - .left, .bottom - .top, repaint) As Boolean
    … …  
    347345        End With
    348346    End Function
    349 
     347/*
    350348    Function OpenClipboard() As Boolean
    351349        Return OpenClipboard(hwnd) As Boolean
    … …  
    355353        Return OpenIcon(hwnd) As Boolean
    356354    End Function
    357 
     355*/
    358356    Function PostMessage(msg As DWord, wp As WPARAM, lp As LPARAM) As Boolean
    359         Return PostMessage(hwnd, msg, wp, lp) As Boolean
     357        Return _System_PostMessage(hwnd, msg, wp, lp) As Boolean
    360358    End Function
    361359
    362360    Function PostMessage(msg As DWord) As Boolean
    363         Return PostMessage(hwnd, msg, 0, 0) As Boolean
    364     End Function
    365 
     361        Return _System_PostMessage(hwnd, msg, 0, 0) As Boolean
     362    End Function
     363/*
    366364    Function RedrawWindow(ByRef rcUpdate As RECT, hrgnUpdate As HRGN, flags As DWord) As Boolean
    367365        Return RedrawWindow(hwnd, rcUpdatre, hrgnUpdate, flags) As Boolean
    368366    End Function
    369 
     367*/
    370368    Function ReleaseDC(hdc As HDC) As Boolean
    371369        Return _System_ReleaseDC(hwnd, hdc) As Boolean
    372370    End Function
    373 
     371/*
    374372    Function RemoveProp(str As String) As HANDLE
    375373        Return RemoveProp(hwnd, ToTCStr(str))
    … …  
    383381        Return RemoveProp(hwnd, atom As ULONG_PTR As PCTSTR)
    384382    End Function
    385 
     383*/
    386384    Const Function ScreenToClient(ByRef pt As POINTAPI) As Boolean
    387385        Return _System_ScreenToClient(hwnd, pt) As Boolean
    … …  
    398396
    399397    Function SendDlgItemMessage(idDlgItem As Long, msg As DWord, wp As WPARAM, lp As LPARAM) As LRESULT
    400         Return SendDlgItemMessage(hwnd, idDlgItem, wp, lp)
     398        Return _System_SendDlgItemMessage(hwnd, idDlgItem, msg, wp, lp)
    401399    End Function
    402400
    403401    Function SendDlgItemMessage(idDlgItem As Long, msg As DWord) As LRESULT
    404         Return SendDlgItemMessage(hwnd, idDlgItem, 0, 0)
     402        Return _System_SendDlgItemMessage(hwnd, idDlgItem, msg, 0, 0)
    405403    End Function
    406404
    407405    Function SendMessage(msg As DWord, wp As WPARAM, lp As LPARAM) As LRESULT
    408         Return SendMessage(hwnd, msg, wp, lp)
     406        Return _System_SendMessage(hwnd, msg, wp, lp)
    409407    End Function
    410408
    411409    Function SendMessage(msg As DWord) As LRESULT
    412         Return SendMessage(hwnd, msg, 0, 0)
    413     End Function
    414 
     410        Return _System_SendMessage(hwnd, msg, 0, 0)
     411    End Function
     412/*
    415413    Function SetActiveWindow() As WindowHandle
    416414        Return New WindowHandle(SetActiveWindow(hwnd))
    … …  
    424422        Return New WindowHandle(SetCapture(hwnd))
    425423    End Function
    426 
     424*/
    427425    Function SetClassLongPtr(index As Long, newLong As LONG_PTR) As LONG_PTR
    428426        Return _System_SetClassLongPtr(hwnd, index, newLong)
    429427    End Function
    430 
     428/*
    431429    Function SetFocus() As WindowHandle
    432430        Return New WindowHandle(SetFocus(hwnd))
    433431    End Function
    434 
     432*/
    435433    Function SetForeground() As Boolean
    436434        Return SetForegroundWindow(hwnd) As Boolean
    … …  
    454452
    455453    Function SetProp(atom As ATOM, hData As HANDLE) As Boolean
    456         Return SetProp((atom As ULONG_PTR) As PCTSTR, hData) As Boolean
     454        Return This.SetProp((atom As ULONG_PTR) As PCTSTR, hData) As Boolean
    457455    End Function
    458456
    … …  
    464462        Return _System_SetScrollInfo(hwnd, fnBar, si, TRUE) As Boolean
    465463    End Function
    466 
     464/*
    467465    Function SetTimer(idEvent As ULONG_PTR, elapse As DWord, timerFunc As TIMERPROC) As ULONG_PTR
    468466        Return SetTmer(hwnd, idEvent, elapse, timerFunc)
    … …  
    470468
    471469    Function SetTimer(idEvent As ULONG_PTR, elapse As DWord) As ULONG_PTR
    472         Return SetTmer(hwnd, idEvent, elapse, 0)
     470        Return This.SetTmer(hwnd, idEvent, elapse, 0)
    473471    End Function
    474472
    … …  
    476474        Return SetContextHelpId(hwnd, contextHelpId) As Boolean
    477475    End Function
    478 
     476*/
    479477    Function SetWindowLongPtr(index As Long, newLong As LONG_PTR) As LONG_PTR
    480478        Return _System_SetWindowLongPtr(hwnd, index, newLong)
    481479    End Function
    482 
     480/*
    483481    Function SetWindowPlacement(ByRef wndpl As WINDOWPLACEMENT) As Boolean
    484482        Return SetWindowPlacement(hwnd, wndpl) As Boolean
    485483    End Function
    486 
     484*/
    487485    Function SetPos(hwndInsertAfter As HWND, x As Long, y As Long, cx As Long, cy As Long, flags As DWord) As Boolean
    488486        Return SetWindowPos(hwnd, hwndInsertAfter, x, y, cx, cy, flags) As Boolean
    … …  
    514512        Return _System_ShowCaret(hwnd) As Boolean
    515513    End Function
    516 
     514/*
    517515    Function ShowScrollBar(bar As DWord, show As Boolean) As Boolean
    518516        Return ShowScrollBar(hwnd, bar, show) As Boolean
    … …  
    522520        Return ShowScrollBar(hwnd, bar, TRUE) As Boolean
    523521    End Function
    524 
     522*/
    525523    Function Show(cmdShow As DWord) As Boolean
    526524        Return ShowWindow(hwnd, cmdShow) As Boolean
    … …  
    556554        Return _System_GetWindowLongPtr(hwnd, GWL_STYLE) As DWord
    557555    End Function
    558 
     556#ifdef _UNDEF
    559557    Const Function GetWndProc() As WNDPROC
    560         Return _System_GetWindowLongPtr(hwnd, GWLP_HINSTANCE) As WNDPROC
    561     End Function
    562 
     558        Return _System_GetWindowLongPtr(hwnd, GWLP_WNDPROC) As WNDPROC
     559    End Function
     560#endif
    563561    Const Function GetInstance() As HINSTANCE
    564562        Return _System_GetWindowLongPtr(hwnd, GWLP_HINSTANCE) As HINSTANCE
    … …  
    576574        Return _System_SetWindowLongPtr(hwnd, GWL_STYLE, style) As DWord
    577575    End Function
    578 
     576#ifdef _UNDEF
    579577    Function SetWndProc(wndProc As WNDPROC) As WNDPROC
    580         Return _System_SetWindowLongPtR(hwnd, GWLP_WNDPROC, wndProc As WNDPROC) As WNDPROC
    581     End Function
    582 
     578        Return _System_SetWindowLongPtr(hwnd, GWLP_WNDPROC, wndProc As WNDPROC) As WNDPROC
     579    End Function
     580#endif
    583581    Function SetUserData(value As LONG_PTR) As LONG_PTR
    584         Return _System_SetWindowLongPtr(value As LONG_PTR)
     582        Return _System_SetWindowLongPtr(hwnd, GWLP_USERDATA, value As LONG_PTR)
    585583    End Function
    586584
    … …  
    592590        Return rc
    593591    End Function
    594 
     592#ifdef _UNDEF
    595593    Sub ClientRect(ByRef rc As RECT)
    596594        Dim hasMenu As BOOL
    597         If IsChild() = False And IsMenu() <> False Then
     595        If IsChild() = False And GetMenu() <> 0 Then
    598596            hasMenu = TRUE
    599597        Else
    … …  
    601599        End If
    602600        AdjustWindowRectEx(rc, GetStyle(), hasMenu, GetExStyle())
    603         MoveWindow(rc) ' WindowRect = rc
    604     End Sub
    605 
     601        This.Move(rc) ' WindowRect = rc
     602    End Sub
     603#endif
    606604    Const Function WindowRect() As RECT
    607605        Dim rc As RECT
    … …  
    611609
    612610    Sub WindowRect(ByRef rc As RECT)
    613         MoveWindow(rc)
    614     End Sub
    615 
     611        This.Move(rc)
     612    End Sub
     613#ifdef _UNDEF
    616614    Const Function ContextHelpID() As DWord
    617615        Return GetContextHelpId(hwnd)
    … …  
    634632        Return w
    635633    End Function
    636 
     634#endif
    637635    Const Function ExStyle() As DWord
    638636        Return _System_GetWindowLongPtr(hwnd, GWL_EXSTYLE) As DWord
    … …  
    640638
    641639    Sub ExStyle(newExStyle As DWord)
    642         _System_SetWindowLongPtr(hwnd, GWLP_EXSTYLE, newExStyle)
     640        _System_SetWindowLongPtr(hwnd, GWL_EXSTYLE, newExStyle)
    643641    End Sub
    644642
    … …  
    648646
    649647    Sub Style(newStyle As DWord)
    650         _System_SetWindowLongPtr(hwnd, GWLP_STYLE, newStyle)
     648        _System_SetWindowLongPtr(hwnd, GWL_STYLE, newStyle)
    651649    End Sub
    652650
    … …  
    660658
    661659    Const Function Font() As HFONT
    662         Return SendMessage(hwnd, WM_GETFONT, 0, 0) As HFONT
     660        Return _System_SendMessage(hwnd, WM_GETFONT, 0, 0) As HFONT
    663661    End Function
    664662
    665663    Sub Font(hfntNew As HFONT)
    666         SendMessage(hwnd, WM_SETFONT, hfntNew As WPARAM, TRUE)
     664        _System_SendMessage(hwnd, WM_SETFONT, hfntNew As WPARAM, TRUE)
    667665    End Sub
    668666
    … …  
    680678
    681679    Const Function Minimized() As Boolean
    682         Return IsIconic(hwnd) As Boolean
     680        Return _System_IsIconic(hwnd) As Boolean
    683681    End Function
    684682
    … …  
    705703    End Sub
    706704
    707     Const Function ProcessID() As DWord
    708         GetWindowProcessThreadId(ProcessID)
    709     End Function
    710 
    711     Const Function ThreadID() As DWord
    712         Return GetWindowProcessThreadId(ByVal 0)
     705    Const Function ProcessId() As DWord
     706        GetWindowThreadProcessId(ProcessId)
     707    End Function
     708
     709    Const Function ThreadId() As DWord
     710        Return GetWindowThreadProcessId(ByVal 0)
    713711    End Function
    714712
    … …  
    759757        Return GetWindowTextLength(hwnd)
    760758    End Function
    761 
     759#ifdef _UNDEF
    762760    Const Function UserData() As LONG_PTR
    763761        Return _System_GetWindowLongPtr(hwnd, GWLP_USERDATA)
    … …  
    767765        _System_SetWindowLongPtr(hwnd, GWLP_USERDATA, newValue)
    768766    End Sub
    769 
     767#endif
    770768    Const Function Visible() As Boolean
    771         Return IsVisible(hwnd) As Boolean
     769        Return IsWindowVisible(hwnd) As Boolean
    772770    End Function
    773771
    … …  
    779777        EndIf
    780778    End Sub
    781 
     779#ifdef _UNDEF
    782780    Const Function WindowPlacement() As WINDOWPLACEMENT
    783781        WindowPlacement.length = Len(WindowPlacement)
    … …  
    796794        _System_SetWindowLongPtr(hwnd, GWLP_WNDPROC, newWndProc As LONG_PTR)
    797795    End Sub
    798 
     796#endif
    799797Protected
    800798    Sub SetHWnd(hwndNew As HWND)
    … …  
    803801End Class
    804802
    805 #endif '__WINDOWS_WINDOWHANDLE_SBP__
     803End Namespace 'Widnows
     804End Namespace 'ActiveBasic

  • trunk/Include/Classes/ActiveBasic/Windows/Windows.ab

    r269 r303  
    2727    Return GetFolderPath(0, folder)
    2828End Function
     29/*
     30Function MessageBox(hw As HWND, s As PCSTR, t As PCSTR, b As DWord) As DWord
     31    Return MessageBoxA(hw, s, t, b)
     32End Function
     33
     34Function MessageBox(hw As HWND, s As PCWSTR, t As PCWSTR, b As DWord) As DWord
     35    Return MessageBoxW(hw, s, t, b)
     36End Function
     37*/
     38
     39Namespace Detail
     40Function _System_MessageBox(hw As HWND, s As PCSTR, t As PCSTR, b As DWord) As DWord
     41    Return MessageBoxA(hw, s, t, b)
     42End Function
     43
     44Function _System_MessageBox(hw As HWND, s As PCWSTR, t As PCWSTR, b As DWord) As DWord
     45    Return MessageBoxW(hw, s, t, b)
     46End Function
     47End Namespace
    2948
    3049End Namespace 'Widnows

  • trunk/Include/Classes/System/Drawing/Color.ab

    r282 r303  
    6969            Exit Sub ' パレットインデックス指定は無効
    7070        Else
    71             argb = Color_MakeARGB(255, GetRValue(rgb), GetGValue(rgb), GetBValue(rgb))
     71            argb = MakeARGB(255, GetRValue(rgb) As Byte, GetGValue(rgb) As Byte, GetBValue(rgb) As Byte)
    7272        End If
    7373    End Sub
    … …  
    8282
    8383    Static Function FromArgb(argb As ARGB) As Color
    84         Dim c As Color(argb)
    85         Rteurn c
     84        Return New Color(argb)
    8685    End Function
    8786
    8887    Static Function FromArgb(a As Byte, base As Color) As Color
    89         Dim c As Color(a, base.R, base.G, base.B)
    90         Return c
     88        Return New Color(a, base.R, base.G, base.B)
    9189    End Function
    9290
    9391    Static Function FromArgb(r As Byte, g As Byte, b As Byte) As Color
    94         Dim c As Color(r, g, b)
    95         Return c
     92        Return New Color(r, g, b)
    9693    End Function
    9794
    9895    Static Function FromArgb(a As Byte, r As Byte, g As Byte, b As Byte) As Color
    99         Dim c As Color(a, r, g, b)
    100         Return c
     96        Return New Color(a, r, g, b)
    10197    End Function
    10298
    … …  
    119115        d = max - min
    120116        If g = max Then
    121             Return (b - r) As Double / d * 60 + 120
     117            Return ((b - r) As Double / d * 60.0 + 120.0) As Single
    122118        ElseIf b = max Then
    123             Return (r - g) As Double / d * 60 + 240
     119            Return ((r - g) As Double / d * 60 + 240) As Single
    124120        ElseIf g < b Then
    125             Return (g - b) As Double / d * 60 + 360
     121            Return ((g - b) As Double / d * 60 + 360) As Single
    126122        Else
    127             Return (g - b) As Double / d * 60
     123            Return ((g - b) As Double / d * 60) As Single
    128124        EndIf
    129125    End Function
    130126
    131127    Function GetSaturation() As Single
    132         Dim max As Long, min As Long
    133128        Dim r = R
    134129        Dim g = G
    135130        Dim b = B
    136         max = System.Math.Max(System.Math.Max(r, g), b)
    137         min = System.Math.Min(System.Math.Min(r, g), b)
     131        Dim max = System.Math.Max(System.Math.Max(r, g), b) As Long
     132        Dim min = System.Math.Min(System.Math.Min(r, g), b) As Long
    138133        Return (max - min) / max
    139134    End Function
    140135
    141136    Function GetBrightness() As Single
    142         Dim max As Long
    143137        Dim r = R
    144138        Dim g = G
    145139        Dim b = B
    146         max = System.Math.Max(System.Math.Max(r, g), b)
     140        Dim max = System.Math.Max(System.Math.Max(r, g), b)
    147141        Return max * (1 / 255)
    148142    End Function

  • trunk/Include/Classes/System/Drawing/Point.ab

    r223 r303  
    7575
    7676    Static Function Add(pt1 As Point, pt2 As Point) As Point
    77         Dim ret As Point(pt1.x + pt2.x, pt1.y + pt2.y)
    78         Return ret
     77        Return New Point(pt1.x + pt2.x, pt1.y + pt2.y)
    7978    End Function
    8079
    8180    Static Function Add(pt As Point, sz As Size) As Point
    82         Dim ret As Point(pt.x + sz.Width, pt.y + sz.Height)
    83         Return ret
     81        Return New Point(pt.x + sz.Width, pt.y + sz.Height)
    8482    End Function
    8583
    8684    Function Offset(pt As Point) As Point
    87         Dim ret As Point(x + pt.x, y + pt.y)
    88         Return ret
     85        Return New Point(x + pt.x, y + pt.y)
    8986    End Function
    9087
    … …  
    9592
    9693    Static Function Substract(pt1 As Point, pt2 As Point) As Point
    97         Dim ret As Point(pt1.x - pt2.x, pt1.y - pt2.y)
    98         Return ret
     94        Return New Point(pt1.x - pt2.x, pt1.y - pt2.y)
    9995    End Function
    10096
    10197    Static Function Substract(pt As Point, sz As Size) As Point
    102         Dim ret As Point(pt.x - sz.Width, pt.y - sz.Height)
    103         Return ret
     98        Return New Point(pt.x - sz.Width, pt.y - sz.Height)
    10499    End Function
    105100
    … …  
    113108
    114109    Static Function Ceiling(ptf As PointF) As Point
    115         Dim pt As Size(Math.Ceiling(ptf.width), Math.Ceiling(ptf.height))
    116         Return pt
     110        Return New Point(System.Math.Ceiling(ptf.X) As Long, System.Math.Ceiling(ptf.Y) As Long)
    117111    End Function
    118112
    119113    Static Function Round(ptf As PointF) As Point
    120         Dim pt As Point(Math.Round(ptf.width), Math.Round(ptf.height))
    121         Return pt
     114        Return New Point(System.Math.Round(ptf.X) As Long, System.Math.Round(ptf.Y) As Long)
    122115    End Function
    123116
    124117    Static Function Truncate(ptf As PointF) As Point
    125         Dim pt As Point(Math.Truncate(ptf.width), Math.Truncate(ptf.height))
    126         Return pt
     118        Return New Point(System.Math.Truncate(ptf.X) As Long, System.Math.Truncate(ptf.Y) As Long)
    127119    End Function
    128120
    129121    Function Operator () As PointF
    130         Return Return PointF(X, Y)
     122        Return New PointF(X, Y)
    131123    End Function
    132124

  • trunk/Include/Classes/System/Drawing/PointF.ab

    r212 r303  
    4848        Return x = 0 And y = 0
    4949    End Function
    50 /*
    51     Sub Operator = (ByRef pt As PointF)
    52         x = pt.x
    53         y = pt.y
    54     End Sub
    55 */
     50
    5651    Function Operator + (pt As PointF) As PointF
    5752        Return Add(This, pt)

  • trunk/Include/Classes/System/Drawing/Rectangle.ab

    r223 r303  
    110110    End Function
    111111
    112     Function Operator == (rc As Rectangle)
     112    Function Operator == (rc As Rectangle) As Boolean
    113113        Return Equals(rc)
    114114    End Function
    115115
    116     Function Operator <> (rc As Rectangle)
    117         Return Not Equals(rc)
     116    Function Operator <> (rc As Rectangle) As Boolean
     117        Return (Not Equals(rc))
    118118    End Function
    119119
    … …  
    147147
    148148    Sub Inflate(dx As Long, dy As Long)
    149         X -= dx
    150         Y -= dy
    151         Width += dx + dx
    152         Height += dy + dy
     149        x -= dx
     150        y -= dy
     151        width += dx + dx
     152        height += dy + dy
    153153    End Sub
    154154
    … …  
    158158
    159159    Static Function Inflate(rc As Rectangle, x As Long, y As Long) As Rectangle
    160         Inflate = New Rectangle(rc)
     160        Inflate = New Rectangle(rc.X, rc.Y, rc.Width, rc.Height)
    161161        Inflate.Inflate(x, y)
    162162    End Function
    163163
    164164    Sub Intersect(rect As Rectangle)
    165         This = Rectangle.Intersect(This, rect)
     165        Dim r = Rectangle.Intersect(This, rect)
     166        x = r.x
     167        y = r.y
     168        width = r.width
     169        height = r.height
    166170    End Sub
    167171
    168172    Static Function Intersect(a As Rectangle, ByRef b As Rectangle) As Rectangle
    169173        Dim right As Long, bottom As Long, left As Long, top As Long
    170         right = Math.Min(a.Right, b.Right)
    171         bottom = Math.Min(a.Bottom, b.Bottom)
    172         left = Math.Min(a.Left, b.Left)
    173         top = Math.Min(a.Top, b.Top)
     174        right = System.Math.Min(a.Right, b.Right)
     175        bottom = System.Math.Min(a.Bottom, b.Bottom)
     176        left = System.Math.Min(a.Left, b.Left)
     177        top = System.Math.Min(a.Top, b.Top)
    174178        Return Rectangle.FromLTRB(left, top, right, bottom)
    175179    End Function
    … …  
    184188    Static Function Union(a As Rectangle, b As Rectangle) As Rectangle
    185189        Dim right As Long, bottom As Long, left As Long, top As Long
    186         right = Math.Max(a.Right(), b.Right())
    187         bottom = Math.Max(a.Bottom(), b.Bottom())
    188         left = Math.Max(a.Left(), b.Left())
    189         top = Math.Max(a.Top(), b.Top())
     190        right = System.Math.Max(a.Right(), b.Right())
     191        bottom = System.Math.Max(a.Bottom(), b.Bottom())
     192        left = System.Math.Max(a.Left(), b.Left())
     193        top = System.Math.Max(a.Top(), b.Top())
    190194        Return FromLTRB(left, top, right, bottom)
    191195    End Function
    … …  
    196200
    197201    Sub Offset(dx As Long, dy As Long)
    198         X += dx
    199         Y += dy
     202        x += dx
     203        y += dy
    200204    End Sub
    201205
    202206    Static Function Ceiling(rcf As RectangleF) As Rectangle
    203207        Dim r As Rectangle(
    204             Math.Ceiling(rcf.X),
    205             Math.Ceiling(rcf.Y),
    206             Math.Ceiling(rcf.Width),
    207             Math.Ceiling(rcf.Height))
     208            System.Math.Ceiling(rcf.X) As Long,
     209            System.Math.Ceiling(rcf.Y) As Long,
     210            System.Math.Ceiling(rcf.Width) As Long,
     211            System.Math.Ceiling(rcf.Height) As Long)
    208212        Return r
    209213    End Function
    … …  
    211215    Static Function Round(rcf As RectangleF) As Rectangle
    212216        Dim r As Rectangle(
    213             Math.Round(rcf.X),
    214             Math.Round(rcf.Y),
    215             Math.Round(rcf.Width),
    216             Math.Round(rcf.Height))
     217            System.Math.Round(rcf.X) As Long,
     218            System.Math.Round(rcf.Y) As Long,
     219            System.Math.Round(rcf.Width) As Long,
     220            System.Math.Round(rcf.Height) As Long)
    217221        Return r
    218222    End Function
    … …  
    220224    Static Function Truncate(rcf As RectangleF) As Rectangle
    221225        Dim r As Rectangle(
    222             Math.Truncate(rcf.X),
    223             Math.Truncate(rcf.Y),
    224             Math.Truncate(rcf.Width),
    225             Math.Truncate(rcf.Height))
     226            System.Math.Truncate(rcf.X) As Long,
     227            System.Math.Truncate(rcf.Y) As Long,
     228            System.Math.Truncate(rcf.Width) As Long,
     229            System.Math.Truncate(rcf.Height) As Long)
    226230        Return r
    227231    End Function

  • trunk/Include/Classes/System/Drawing/RectangleF.ab

    r212 r303  
    106106
    107107    Function IsEmpty() As Boolean
    108         If Width <= 0 Or Height <= 0 Then
    109             IsEmpty = _System_TRUE
    110         Else
    111             IsEmpty = _System_FALSE
    112         End If
    113     End Function
    114 /*
    115     Function Operator =(ByRef rc As RectangleF)
    116         With rc
    117             x = .x
    118             y = .y
    119             width = .width
    120             height = .height
    121         End With
    122     End Function
    123 */
    124     Function Operator ==(rc As RectangleF)
     108        Return Width <= 0 Or Height <= 0
     109    End Function
     110
     111    Function Operator ==(rc As RectangleF) As Boolean
    125112        Return Equals(rc)
    126113    End Function
    127114
    128     Function Operator <>(rc As RectangleF)
     115    Function Operator <>(rc As RectangleF) As Boolean
    129116        Return Not Equals(rc)
    130117    End Function
    131118
    132119    Function Equals(rc As RectangleF) As Boolean
    133         If X = rc.X And Y = rc.Y And Width = rc.Width And Height = rc.Height Then
    134             Return True
    135         Else
    136             Return False
    137         End If
     120        Equals = (X = rc.X And Y = rc.Y And Width = rc.Width And Height = rc.Height)
    138121    End Function
    139122
    … …  
    147130
    148131    Function Contains(x As Single, y As Single) As Boolean
    149         If x >= X And x < X + Width And y >= Y And y < Y + Height Then
    150             Contains = _System_TRUE
    151         Else
    152             Contains = _System_FALSE
    153         End If
     132        Contains = (x >= X And x < X + Width And y >= Y And y < Y + Height)
    154133    End Function
    155134
    … …  
    159138
    160139    Function Contains(rc As RectangleF) As Boolean
    161         If X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom Then
    162             Return True
    163         Else
    164             Return False
    165         End If
     140        Contains = (X <= rc.X And rc.Right <= Right And Y <= rc.Y And rc.Bottom <= Bottom)
    166141    End Function
    167142
    168143    Sub Inflate(dx As Single, dy As Single)
    169         X -= dx
    170         Y -= dy
    171         Width += dx + dx
    172         Height += dy + dy
     144        x -= dx
     145        y -= dy
     146        width += dx + dx
     147        height += dy + dy
    173148    End Sub
    174149
    … …  
    178153
    179154    Static Function Inflate(rc As RectangleF, x As Single, y As Single) As RectangleF
    180         Inflate = New Rectangle(rc)
     155        Inflate = New RectangleF(rc.X, rc.Y, rc.Width, rc.Height)
    181156        Inflate.Inflate(x, y)
    182157    End Function
    183158
    184159    Sub Intersect(rect As RectangleF)
    185         This = RectangleF.Intersect(This, rect)
     160        Dim r = RectangleF.Intersect(This, rect)
     161        x = r.x
     162        y = r.y
     163        width = r.width
     164        height = r.height
    186165    End Sub
    187166   
    188167    Static Function Intersect(a As RectangleF, b As RectangleF) As RectangleF
    189168        Dim right As Single, bottom As Single, left As Single, top As Single
    190         right = Math.Min(a.Right, b.Right)
    191         bottom = Math.Min(a.Bottom, b.Bottom)
    192         left = Math.Min(a.Left, b.Left)
    193         top = Math.Min(a.Top, b.Top)
     169        right = System.Math.Min(a.Right, b.Right)
     170        bottom = System.Math.Min(a.Bottom, b.Bottom)
     171        left = System.Math.Min(a.Left, b.Left)
     172        top = System.Math.Min(a.Top, b.Top)
    194173        Return FromLTRB(left, top, right, bottom)
    195174    End Function
    … …  
    200179            Right > rc.Left And _
    201180            Bottom > rc.Top Then
    202             IntersectsWith = _System_TRUE
     181            IntersectsWith = True
    203182        Else
    204             IntersectsWith = _System_FALSE
     183            IntersectsWith = False
    205184        End If
    206185    End Function
    … …  
    208187    Static Function Union(a As RectangleF, b As RectangleF) As RectangleF
    209188        Dim right As Single, bottom As Single, left As Single, top As Single
    210         right = Math.Max(a.Right(), b.Right())
    211         bottom = Math.Max(a.Bottom(), b.Bottom())
    212         left = Math.Max(a.Left(), b.Left())
    213         top = Math.Max(a.Top(), b.Top())
     189        right = System.Math.Max(a.Right(), b.Right())
     190        bottom = System.Math.Max(a.Bottom(), b.Bottom())
     191        left = System.Math.Max(a.Left(), b.Left())
     192        top = System.Math.Max(a.Top(), b.Top())
    214193        Return FromLTRB(left, top, right, bottom)
    215194    End Function
    … …  
    220199
    221200    Sub Offset(dx As Single, dy As Single)
    222         X += dx
    223         Y += dy
     201        x += dx
     202        y += dy
    224203    End Sub
    225204

  • trunk/Include/Classes/System/Drawing/Size.ab

    r223 r303  
    7070    Function Equals(sz As Size) As Boolean
    7171        If width = sz.width And height = sz.height Then
    72             Equals = _System_TRUE
     72            Equals = True
    7373        Else
    74             Equals = _System_FALSE
     74            Equals = False
    7575        End If
    7676    End Function
    … …  
    9393
    9494    Static Function Ceiling(szf As SizeF) As Size
    95         Dim sz As Size(Math.Ceiling(szf.width), Math.Ceiling(szf.height))
     95        Dim sz As Size(System.Math.Ceiling(szf.Width) As Long, System.Math.Ceiling(szf.Height) As Long)
    9696        Return sz
    9797    End Function
    9898
    9999    Static Function Round(szf As SizeF) As Size
    100         Dim sz As Size(Math.Round(szf.width), Math.Round(szf.height))
     100        Dim sz As Size(System.Math.Round(szf.Width) As Long, System.Math.Round(szf.Height) As Long)
    101101        Return sz
    102102    End Function
    103103
    104104    Static Function Truncate(szf As SizeF) As Size
    105         Dim sz As Size(Math.Truncate(szf.width), Math.Truncate(szf.height))
     105        Dim sz As Size(System.Math.Truncate(szf.Width) As Long, System.Math.Truncate(szf.Height) As Long)
    106106        Return sz
    107107    End Function

  • trunk/Include/Classes/System/Drawing/SizeF.ab

    r223 r303  
    6868
    6969    Override Function GetHashCode() As Long
    70         Return VarPtr(GetDWord(width)) Xor _System_BSwap(VarPtr(GetDWord(height)))
     70        Return GetDWord(VarPtr(width)) Xor _System_BSwap(GetDWord(VarPtr(height)))
    7171    End Function
    7272
    … …  
    7575    End Function
    7676
    77     Function Add(sz As Size) As Size
     77    Function Add(sz As SizeF) As SizeF
    7878        Return This + sz
    7979    End Function

  • trunk/Include/Classes/System/Media/SystemSound.ab

    r116 r303  
    1515Public
    1616    Sub Play()
    17         PlaySound(SoundID,GetModuleHandle(NULL),SND_ALIAS_ID)
     17        PlaySound(SoundID As LPCTSTR, GetModuleHandle(NULL), SND_ALIAS_ID)
    1818    End Sub
    1919

  • trunk/Include/Classes/System/Threading/Thread.ab

    r249 r303  
    281281        For i=0 To ELM(ThreadNum)
    282282
    283             If currentThread.Equals( ByVal ppobj_Thread[i] ) Then
     283            If currentThread.Equals( ppobj_Thread[i] As Object ) Then
    284284                Continue
    285285            End If
    … …  
    298298        For i=0 To ELM(ThreadNum)
    299299
    300             If currentThread.Equals( ByVal ppobj_Thread[i] ) Then
     300            If currentThread.Equals( ppobj_Thread[i] As Object ) Then
    301301                Continue
    302302            End If

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

    r285 r303  
    44#define __SYSTEM_WINDOWS_FORMS_CONTROL_AB__
    55
    6 #require <windows/WindowHandle.sbp>
    76#require <Classes/System/Windows/Forms/misc.ab>
    87#require <Classes/System/Windows/Forms/CreateParams.ab>
    … …  
    1716#require <Classes/System/Drawing/Rectangle.ab>
    1817#require <Classes/System/Runtime/InteropServices/GCHandle.ab>
     18#require <Classes/ActiveBasic/Windows/WindowHandle.sbp>
    1919#require <Classes/ActiveBasic/Strings/Strings.ab>
    2020
    … …  
    4444
    4545    Override Function CompletedSynchronously() As Boolean
    46         Return FALSE
     46        Return False
    4747    End Function
    4848
    … …  
    7474
    7575Class Control
     76
    7677'   Inherits IWin32Window
    7778Public
    … …  
    8081    Function AllowDrop() As Boolean
    8182    End Function
     83
     84    'Anchor
     85    'AutoScrollOffset
     86    'AutoSize
     87    'BackColor下
     88    'BackgroundImage
     89    'BackgroundImageLayout
     90    '-BindingContext
     91    'Bottom 下
     92    'Bounds 下
     93    'CanFocus
     94    'CanSelect
     95    'Capture
     96    '-CausesValidation
     97    'CheckForIllegalCrossThreadCalls
    8298
    8399    /*Override*/ Function Handle() As HWND
    … …  
    201217        Return b.Top + b.Height
    202218    End Function
    203 
     219/*
    204220    Const Function PointToScreen(p As Point) As Point
    205221        PointToScreen = New Point
    206         ret.X = p.X
    207         ret.Y = p.Y
    208         wnd.ClientToScreen(ByVal VarPtr(PointToScreen) As *POINTAPI)
     222        PointToScreen.X = p.X
     223        PointToScreen.Y = p.Y
     224        wnd.ClientToScreen(ByVal ObjPtr(PointToScreen) As *POINTAPI)
    209225    End Function
    210226
    211227    Const Function PointToClient(p As Point) As Point
    212228        PointToScreen = New Point
    213         ret.X = p.X
    214         ret.Y = p.Y
    215         wnd.ScreenToClient(ByVal VarPtr(PointToScreen) As *POINTAPI)
    216     End Function
    217 
     229        PointToClient.X = p.X
     230        PointToClient.Y = p.Y
     231        wnd.ScreenToClient(ByVal ObjPtr(PointToClient) As *POINTAPI)
     232    End Function
     233*/
    218234    Const Function RectangleToScreen(r As Rectangle) As Rectangle
    219235        Dim rc = r.ToRECT
    … …  
    223239
    224240    Const Function RectangleToClient(r As Rectangle) As Rectangle
    225         Dim rc As RECT
    226         rc = r.ToRECT()
     241        Dim rc = r.ToRECT()
    227242        wnd.ScreenToClient(rc)
    228243        Return New Rectangle(rc)
    … …  
    230245
    231246    Const Function InvokeRequired() As Boolean
    232         Return wnd.ThreadID <> GetCurrentThreadId()
     247        Return wnd.ThreadId <> GetCurrentThreadId()
    233248    End Function
    234249
    … …  
    239254    Virtual Sub BackColor(c As Color)
    240255        c = bkColor
    241         Dim e As EventArgs
    242         OnBackColorChanged(e)
     256        OnBackColorChanged(New EventArgs)
    243257    End Sub
    244258
    … …  
    248262
    249263    Const Function IsHandleCreated() As Boolean
    250         Return wnd.HWnd <> 0
     264        Return wnd.HWnd <> 0 Or IsWindow(wnd.HWnd) <> FALSE
    251265    End Function
    252266
    … …  
    259273
    260274    Sub Control()
     275        Debug
    261276        Dim sz = DefaultSize()
    262277        Control("", 100, 100, sz.Width, sz.Height)
    … …  
    279294
    280295    Sub Control(parent As Control, text As String, left As Long, top As Long, width As Long, height As Long)
    281         This.parent = VarPtr(parent)
     296        This.parent = parent
    282297        Control(text, left, top, width, height)
    283298    End Sub
    … …  
    296311    '---------------------------------------------------------------------------
    297312    ' Public Methods
    298 
     313/*
    299314    ' 同期関数呼出、Controlが作成されたスレッドで関数を実行する。
    300315    ' 関数は同期的に呼び出されるので、関数が終わるまでInvokeは制御を戻さない。
    … …  
    317332        Dim gch = System.Runtime.InteropServices.GCHandle.Alloc(asyncInvokeData)
    318333        wnd.PostMessage(WM_CONTROL_BEGININVOKE, 0, System.Runtime.InteropServices.GCHandle.ToIntPtr(gch))
    319         Return pAsyncResult
     334        Return asyncResult
    320335    End Function
    321336
    … …  
    327342        Return arInvoke.Result
    328343    End Function
    329 
     344*/
    330345    ' 与えられたウィンドウハンドルがControl（若しくはその派生クラス）の
    331346    ' インスタンスに対応するものであった場合、
    … …  
    360375
    361376    Sub Show()
     377        Debug
    362378        wnd.Show(SW_SHOW)
    363379    End Sub
    … …  
    396412    Virtual Sub CreateHandle()
    397413        Dim createParams = CreateParams()
    398         Dim gch = GCHandle.Alloc(This)
    399         TlsSetValue(tlsIndex, GCHandle.ToIntPtr(gch) As VoidPtr)
     414        Dim gch = System.Runtime.InteropServices.GCHandle.Alloc(This)
     415        TlsSetValue(tlsIndex, System.Runtime.InteropServices.GCHandle.ToIntPtr(gch) As VoidPtr)
    400416        With createParams
    401417            Dim hwndParent = 0 As HWND
    … …  
    516532Private
    517533    ' Member variables
    518     wnd As WindowHandle
     534    wnd As ActiveBasic.Windows.WindowHandle
    519535    text As String
    520536    parent As Control
    … …  
    590606                ExitThread(-1)
    591607            End If
    592             rThis.wnd = New WindowHandle(hwnd)
     608            rThis.wnd = New ActiveBasic.Windows.WindowHandle(hwnd)
    593609            SetWindowLongPtr(hwnd, GWLP_THIS, gchValue)
    594610        End If

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

    r282 r303  
    5555        Return hwnd = x.hwnd And _
    5656            msg = x.msg And _
    57             wp = .wp And _
    58             lp = .lp And _
    59             lr = .lr
     57            wp = x.wp And _
     58            lp = x.lp And _
     59            lr = x.lr
    6060    End Function
    6161

  • trunk/Include/Classes/System/Windows/Forms/index.ab

    r223 r303  
    99#require <Classes/System/Windows/Forms/CreateParams.ab>
    1010#require <Classes/System/Windows/Forms/PaintEventArgs.ab>
     11#require <Classes/System/Windows/Forms/MessageBox.ab>
    1112
    1213#endif '__SYSTEM_WINDOWS_FORMS_INDEX_AB__

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

    r282 r303  
    1 ' Classes/System/Windows/Forms/misc.ab
     1'Classes/System/Windows/Forms/misc.ab
    22
    33#ifndef __SYSTEM_WINDOWS_FORMS_MISC_AB__
    … …  
    197197End Enum
    198198
     199Enum DialogResult
     200    None = 0
     201    OK = IDOK
     202    Abort = IDABORT
     203    Cancel = IDCANCEL
     204    Retry = IDRETRY
     205    Ignore = IDIGNORE
     206    Yes = IDYES
     207    No = IDNO
     208End Enum
     209
    199210End Namespace 'Forms
    200211End Namespace 'Widnows
Note: See TracChangeset for help on using the changeset viewer.