remove some unused special handling code and comments Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp Modified: trunk/reactos/subsys/system/explorer/utility/window.h _____
Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp --- trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-10-17 12:04:26 UTC (rev 18513) +++ trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-10-17 12:07:49 UTC (rev 18514) @@ -277,15 +277,6 @@
LRESULT Window::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { -/**@todo: replaced by StartMenu::TrackStartmenu() - HWND hwnd = _hwnd; - - // close startup menu and other popup menus - // This functionality is for tray notification icons missing in MS Windows. - if (nmsg == WM_SETFOCUS) - CancelModes((HWND)wparam); // erronesly cancels desktop bar resize when switching from another process -*/ - return DefWindowProc(_hwnd, nmsg, wparam, lparam); }
@@ -299,12 +290,9 @@ return 0; }
-void Window::CancelModes(HWND hwnd) +void Window::CancelModes() { - if (hwnd) - PostMessage(hwnd, WM_CANCELMODE, 0, 0); - else - PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0); + PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0); }
@@ -352,12 +340,6 @@
LRESULT SubclassedWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { -/**@todo: replaced by StartMenu::TrackStartmenu() - // close startup menu and other popup menus - // This functionality is for tray notification icons missing in MS Windows. - if (nmsg == WM_SETFOCUS) - CancelModes((HWND)wparam); -*/ return CallWindowProc(_orgWndProc, _hwnd, nmsg, wparam, lparam); }
_____
Modified: trunk/reactos/subsys/system/explorer/utility/window.h --- trunk/reactos/subsys/system/explorer/utility/window.h 2005-10-17 12:04:26 UTC (rev 18513) +++ trunk/reactos/subsys/system/explorer/utility/window.h 2005-10-17 12:07:49 UTC (rev 18514) @@ -102,7 +102,7 @@
LRESULT SendParent(UINT nmsg, WPARAM wparam=0, LPARAM lparam=0); LRESULT PostParent(UINT nmsg, WPARAM wparam=0, LPARAM lparam=0);
- static void CancelModes(HWND hwnd=0); + static void CancelModes();
protected: