mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:43:31 +00:00
Removed calls to WIDGETS_IsControl.
This commit is contained in:
parent
8c752fd79d
commit
b83a16c148
2 changed files with 13 additions and 30 deletions
|
@ -207,22 +207,9 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam,
|
|||
HWND hwndFocus = GetFocus();
|
||||
if (hwndFocus)
|
||||
{
|
||||
WND *wnd = WIN_FindWndPtr( hwndFocus );
|
||||
|
||||
if( wnd )
|
||||
{
|
||||
/* always make combo box hide its listbox control */
|
||||
|
||||
if( WIDGETS_IsControl( wnd, BIC32_COMBO ) )
|
||||
SendMessageA( hwndFocus, CB_SHOWDROPDOWN,
|
||||
FALSE, 0 );
|
||||
else if( WIDGETS_IsControl( wnd, BIC32_EDIT ) &&
|
||||
WIDGETS_IsControl( wnd->parent,
|
||||
BIC32_COMBO ))
|
||||
SendMessageA( wnd->parent->hwndSelf,
|
||||
CB_SHOWDROPDOWN, FALSE, 0 );
|
||||
}
|
||||
WIN_ReleaseWndPtr(wnd);
|
||||
/* always make combo box hide its listbox control */
|
||||
if (!SendMessageA( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 ))
|
||||
SendMessageA( GetParent(hwndFocus), CB_SHOWDROPDOWN, FALSE, 0 );
|
||||
}
|
||||
}
|
||||
return DefWindowProcA( hwnd, msg, wParam, lParam );
|
||||
|
|
|
@ -1936,20 +1936,16 @@ INT WINPROC_MapMsg32ATo16( HWND hwnd, UINT msg32, WPARAM wParam32,
|
|||
*plparam = MAKELPARAM( HIWORD(wParam32), (HMENU16)*plparam );
|
||||
return 0;
|
||||
case WM_MDIACTIVATE:
|
||||
{
|
||||
WND *tempWnd = WIN_FindWndPtr(hwnd);
|
||||
if( WIDGETS_IsControl(tempWnd, BIC32_MDICLIENT) )
|
||||
{
|
||||
*pwparam16 = (HWND)wParam32;
|
||||
*plparam = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
*pwparam16 = ((HWND)*plparam == hwnd);
|
||||
*plparam = MAKELPARAM( (HWND16)LOWORD(*plparam),
|
||||
(HWND16)LOWORD(wParam32) );
|
||||
}
|
||||
WIN_ReleaseWndPtr(tempWnd);
|
||||
if (GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_MDICHILD)
|
||||
{
|
||||
*pwparam16 = ((HWND)*plparam == hwnd);
|
||||
*plparam = MAKELPARAM( (HWND16)LOWORD(*plparam),
|
||||
(HWND16)LOWORD(wParam32) );
|
||||
}
|
||||
else
|
||||
{
|
||||
*pwparam16 = (HWND)wParam32;
|
||||
*plparam = 0;
|
||||
}
|
||||
return 0;
|
||||
case WM_NCCALCSIZE:
|
||||
|
|
Loading…
Reference in a new issue