From a33a1f21db9b2a8996acb417a72c008a738ddc2e Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Fri, 18 Feb 2011 14:28:58 +0000 Subject: [PATCH] [explorer] - Fix some visual problems in the toolbar svn path=/trunk/; revision=50798 --- reactos/base/shell/explorer/shell/mainframe.cpp | 2 +- reactos/base/shell/explorer/shell/shellbrowser.cpp | 8 ++++++-- reactos/base/shell/explorer/utility/window.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/reactos/base/shell/explorer/shell/mainframe.cpp b/reactos/base/shell/explorer/shell/mainframe.cpp index 9019de568cc..d03efbfcd7e 100644 --- a/reactos/base/shell/explorer/shell/mainframe.cpp +++ b/reactos/base/shell/explorer/shell/mainframe.cpp @@ -873,7 +873,7 @@ HWND MDIMainFrame::Create() HMENU hMenuFrame = LoadMenu(g_Globals._hInstance, MAKEINTRESOURCE(IDM_MDIFRAME)); return Window::Create(WINDOW_CREATOR(MDIMainFrame), 0, - (LPCTSTR)(int)g_Globals._hframeClass, ResString(IDS_TITLE), WS_OVERLAPPEDWINDOW, + (LPCTSTR)(int)g_Globals._hframeClass, ResString(IDS_TITLE), WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 0/*hwndDesktop*/, hMenuFrame); } diff --git a/reactos/base/shell/explorer/shell/shellbrowser.cpp b/reactos/base/shell/explorer/shell/shellbrowser.cpp index a8728293e0f..17a23d01b52 100644 --- a/reactos/base/shell/explorer/shell/shellbrowser.cpp +++ b/reactos/base/shell/explorer/shell/shellbrowser.cpp @@ -654,8 +654,12 @@ MDIShellBrowserChild::MDIShellBrowserChild(HWND hwnd, const ShellChildWndInfo& i MDIShellBrowserChild* MDIShellBrowserChild::create(const ShellChildWndInfo& info) { - ChildWindow* child = ChildWindow::create(info, info._pos.rcNormalPosition, - WINDOW_CREATOR_INFO(MDIShellBrowserChild,ShellChildWndInfo), CLASSNAME_CHILDWND, NULL, info._pos.showCmd==SW_SHOWMAXIMIZED? WS_MAXIMIZE: 0); + ChildWindow* child = ChildWindow::create(info, + info._pos.rcNormalPosition, + WINDOW_CREATOR_INFO(MDIShellBrowserChild,ShellChildWndInfo), + CLASSNAME_CHILDWND, + NULL, + WS_CLIPCHILDREN | (info._pos.showCmd==SW_SHOWMAXIMIZED? WS_MAXIMIZE: 0)); return static_cast(child); } diff --git a/reactos/base/shell/explorer/utility/window.cpp b/reactos/base/shell/explorer/utility/window.cpp index cfbce1db79f..4ad750f7a8c 100644 --- a/reactos/base/shell/explorer/utility/window.cpp +++ b/reactos/base/shell/explorer/utility/window.cpp @@ -39,7 +39,7 @@ WindowClass::WindowClass(LPCTSTR classname, UINT style_, WNDPROC wndproc) style = style_; hInstance = g_Globals._hInstance; hCursor = LoadCursor(0, IDC_ARROW); - + this->hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); lpszClassName = classname; lpfnWndProc = wndproc;