[SHELL32] -CMenuBand: Correctly get the setting for flat menus. CORE-8925
authorGiannis Adamopoulos <gadamopoulos@reactos.org>
Wed, 3 May 2017 21:49:38 +0000 (21:49 +0000)
committerGiannis Adamopoulos <gadamopoulos@reactos.org>
Wed, 3 May 2017 21:49:38 +0000 (21:49 +0000)
svn path=/trunk/; revision=74467

reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp

index 7e6410f..fa30104 100644 (file)
@@ -296,10 +296,7 @@ HRESULT CMenuToolbarBase::ShowDW(BOOL fShow)
     UpdateImageLists();
 
     // For custom-drawing
     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;
 }
 
     return S_OK;
 }
@@ -387,10 +384,7 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
 
     SetWindowTheme(m_hWnd, L"", L"");
 
 
     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);
 
 
     m_menuBand->AdjustForTheme(m_useFlatMenus);