mirror of
https://github.com/reactos/reactos.git
synced 2024-07-08 13:45:06 +00:00
[SHELL32]
- Minor stylistic whitespace changes. - Use 'IDA_DESKBROWSER' instead of hardcoding its value. - The shell progman window uses the COLOR_DESKTOP as its hbrBackground: partly revert r66271. - Correctly initialize rcDesk structure before using it for a CreateWindowEx call. svn path=/trunk/; revision=71524
This commit is contained in:
parent
4e9504f015
commit
d63c3a89ad
|
@ -39,7 +39,7 @@ public:
|
|||
private:
|
||||
HWND hWnd;
|
||||
HWND hWndShellView;
|
||||
HWND hWndDesktopListView;
|
||||
HWND hWndDesktopListView; // FIXME: Unused
|
||||
CComPtr<IShellDesktopTray> ShellDesk;
|
||||
CComPtr<IShellView> DesktopView;
|
||||
CComPtr<IShellBrowser> DefaultShellBrowser;
|
||||
|
@ -452,11 +452,11 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
|
|||
break;
|
||||
|
||||
case WM_SIZE:
|
||||
{
|
||||
if (wParam == SIZE_MINIMIZED)
|
||||
{
|
||||
/* Hey, we're the desktop!!! */
|
||||
ShowWindow(hwnd,
|
||||
SW_RESTORE);
|
||||
ShowWindow(hwnd, SW_RESTORE);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -471,6 +471,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
|
|||
DBG_UNREFERENCED_LOCAL_VARIABLE(rcDesktop);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case WM_SYSCOLORCHANGE:
|
||||
case WM_SETTINGCHANGE:
|
||||
|
@ -496,7 +497,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
|
|||
if (!pThis->CreateDeskWnd())
|
||||
WARN("Could not create the desktop view control!\n");
|
||||
|
||||
pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(3));
|
||||
pThis->m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_DESKBROWSER));
|
||||
|
||||
break;
|
||||
}
|
||||
|
@ -511,9 +512,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
|
|||
break;
|
||||
}
|
||||
|
||||
SetWindowLongPtrW(hwnd,
|
||||
0,
|
||||
(LONG_PTR)pThis);
|
||||
SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pThis);
|
||||
Ret = TRUE;
|
||||
break;
|
||||
}
|
||||
|
@ -557,7 +556,7 @@ RegisterProgmanWindowClass(VOID)
|
|||
wcProgman.hInstance = shell32_hInstance;
|
||||
wcProgman.hIcon = NULL;
|
||||
wcProgman.hCursor = LoadCursorW(NULL, IDC_ARROW);
|
||||
wcProgman.hbrBackground = NULL;
|
||||
wcProgman.hbrBackground = (HBRUSH)(COLOR_DESKTOP + 1);
|
||||
wcProgman.lpszMenuName = NULL;
|
||||
wcProgman.lpszClassName = szProgmanClassName;
|
||||
|
||||
|
@ -588,8 +587,8 @@ HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
|
|||
|
||||
rcDesk.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
|
||||
rcDesk.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
|
||||
rcDesk.right = rcDesk.left + GetSystemMetrics(SM_CXVIRTUALSCREEN);
|
||||
rcDesk.bottom = rcDesk.top + GetSystemMetrics(SM_CYVIRTUALSCREEN);
|
||||
rcDesk.right = GetSystemMetrics(SM_CXVIRTUALSCREEN);
|
||||
rcDesk.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
|
||||
|
||||
if (IsRectEmpty(&rcDesk))
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue