From ec320d1e33cc355999215b8d71490df373baa9cf Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Wed, 3 May 2017 21:49:38 +0000 Subject: [PATCH] [SHELL32] -CMenuBand: Correctly get the setting for flat menus. CORE-8925 svn path=/trunk/; revision=74467 --- reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 7e6410f42ad..fa3010472d5 100644 --- a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -296,10 +296,7 @@ HRESULT CMenuToolbarBase::ShowDW(BOOL fShow) UpdateImageLists(); // For custom-drawing - if (IsAppThemed()) - GetThemeSysBool(GetWindowTheme(m_hWnd), TMT_FLATMENUS); - else - SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); return S_OK; } @@ -387,10 +384,7 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) SetWindowTheme(m_hWnd, L"", L""); - if (IsAppThemed()) - GetThemeSysBool(GetWindowTheme(m_hWnd), TMT_FLATMENUS); - else - SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); m_menuBand->AdjustForTheme(m_useFlatMenus); -- 2.17.1