mirror of
https://github.com/reactos/reactos.git
synced 2024-10-20 08:01:05 +00:00
[User32]
- Icon title, menu and scroll bar do not set the death bit. Menu and scroll bar set the id only on specific window messages. svn path=/trunk/; revision=54261
This commit is contained in:
parent
9485661218
commit
7a4e31a240
|
@ -189,27 +189,6 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
|
||||||
{
|
{
|
||||||
HWND owner = GetWindow( hWnd, GW_OWNER );
|
HWND owner = GetWindow( hWnd, GW_OWNER );
|
||||||
|
|
||||||
#ifdef __REACTOS__ // Do this now, remove after Server side is fixed.
|
|
||||||
PWND pWnd;
|
|
||||||
|
|
||||||
pWnd = ValidateHwnd(hWnd);
|
|
||||||
if (pWnd)
|
|
||||||
{
|
|
||||||
if (!pWnd->fnid)
|
|
||||||
{
|
|
||||||
NtUserSetWindowFNID(hWnd, FNID_ICONTITLE);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (pWnd->fnid != FNID_ICONTITLE)
|
|
||||||
{
|
|
||||||
ERR("Wrong window class for IconTitle!\n");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!IsWindow(hWnd)) return 0;
|
if (!IsWindow(hWnd)) return 0;
|
||||||
|
|
||||||
switch( msg )
|
switch( msg )
|
||||||
|
@ -223,12 +202,6 @@ LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg,
|
||||||
hIconTitleFont = CreateFontIndirectA( &logFont );
|
hIconTitleFont = CreateFontIndirectA( &logFont );
|
||||||
}
|
}
|
||||||
return (hIconTitleFont ? 0 : -1);
|
return (hIconTitleFont ? 0 : -1);
|
||||||
#ifdef __REACTOS__
|
|
||||||
case WM_NCDESTROY:
|
|
||||||
NtUserSetWindowFNID(hWnd, FNID_DESTROY);
|
|
||||||
case WM_DESTROY:
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case WM_NCHITTEST:
|
case WM_NCHITTEST:
|
||||||
return HTCAPTION;
|
return HTCAPTION;
|
||||||
case WM_NCMOUSEMOVE:
|
case WM_NCMOUSEMOVE:
|
||||||
|
|
|
@ -110,7 +110,7 @@ IntDrawScrollInterior(HWND hWnd, HDC hDC, INT nBar, BOOL Vertical,
|
||||||
*/
|
*/
|
||||||
if (nBar == SB_CTL)
|
if (nBar == SB_CTL)
|
||||||
{
|
{
|
||||||
hBrush = (HBRUSH)SendMessageW(GetParent(hWnd), WM_CTLCOLORSCROLLBAR, (WPARAM)hDC, (LPARAM)hWnd);
|
hBrush = GetControlBrush( hWnd, hDC, WM_CTLCOLORSCROLLBAR);
|
||||||
if (!hBrush)
|
if (!hBrush)
|
||||||
hBrush = GetSysColorBrush(COLOR_SCROLLBAR);
|
hBrush = GetSysColorBrush(COLOR_SCROLLBAR);
|
||||||
}
|
}
|
||||||
|
@ -1251,6 +1251,10 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA
|
||||||
{
|
{
|
||||||
if (!pWnd->fnid)
|
if (!pWnd->fnid)
|
||||||
{
|
{
|
||||||
|
if (Msg != WM_CREATE)
|
||||||
|
{
|
||||||
|
return DefWindowProc(Wnd, Msg, wParam, lParam);
|
||||||
|
}
|
||||||
NtUserSetWindowFNID(Wnd, FNID_SCROLLBAR);
|
NtUserSetWindowFNID(Wnd, FNID_SCROLLBAR);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1275,15 +1279,6 @@ ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARA
|
||||||
IntScrollCreateScrollBar(Wnd, (LPCREATESTRUCTW) lParam);
|
IntScrollCreateScrollBar(Wnd, (LPCREATESTRUCTW) lParam);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef __REACTOS__
|
|
||||||
case WM_DESTROY:
|
|
||||||
return DefWindowProc(Wnd, Msg, wParam, lParam );
|
|
||||||
|
|
||||||
case WM_NCDESTROY:
|
|
||||||
NtUserSetWindowFNID(Wnd, FNID_DESTROY);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//#if 0 /* FIXME */
|
//#if 0 /* FIXME */
|
||||||
case WM_ENABLE:
|
case WM_ENABLE:
|
||||||
{
|
{
|
||||||
|
|
|
@ -1899,6 +1899,10 @@ PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
if (!pWnd->fnid)
|
if (!pWnd->fnid)
|
||||||
{
|
{
|
||||||
|
if (Message != WM_NCCREATE)
|
||||||
|
{
|
||||||
|
return DefWindowProcW(Wnd, Message, wParam, lParam);
|
||||||
|
}
|
||||||
NtUserSetWindowFNID(Wnd, FNID_MENU);
|
NtUserSetWindowFNID(Wnd, FNID_MENU);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -1954,12 +1958,6 @@ PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#ifdef __REACTOS__
|
|
||||||
case WM_NCDESTROY:
|
|
||||||
NtUserSetWindowFNID(Wnd, FNID_DESTROY);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
case WM_SHOWWINDOW:
|
case WM_SHOWWINDOW:
|
||||||
if (0 != wParam)
|
if (0 != wParam)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue