Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 02:26:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER]: Also, sending direct WM_CLOSE messages to the traybar should not close it but instead popup the shutdown dialog. Addendum to r71533.

Browse source 
CORE-4351 CORE-8864

svn path=/trunk/; revision=71535
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-05 14:29:28 +00:00
parent 1cfa76b438
commit 94b20ff164
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/base/shell/explorer/traywnd.cpp
View file

@ -2610,9 +2610,10 @@ HandleTrayContextMenu:
LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
/* /*
* TWM_DOEXITWINDOWS is send by the CDesktopBrowser to us * TWM_DOEXITWINDOWS is send by the CDesktopBrowser to us
* to show the shutdown dialog. * to show the shutdown dialog. Also a WM_CLOSE message sent
* by apps should show the dialog.
*/ */
return DoExitWindows(); return DoExitWindows();
} }
@ -2868,6 +2869,7 @@ HandleTrayContextMenu:
MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy) MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy)
MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu)
MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows)
MESSAGE_HANDLER(WM_CLOSE, OnDoExitWindows)
MESSAGE_HANDLER(WM_HOTKEY, OnHotkey) MESSAGE_HANDLER(WM_HOTKEY, OnHotkey)
ALT_MSG_MAP(1) ALT_MSG_MAP(1)
END_MSG_MAP() END_MSG_MAP()