[SHELL32] -CMenuBand: forward WM_WININICHANGE to CMenuToolbarBase so that when themes...

svn path=/trunk/; revision=75072

diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp
index 1e87eac..78b10e3 100644 (file)
--- a/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp
+++ b/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp
@@ -720,6 +720,13 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wPa
         BOOL bFlatMenus;
         SystemParametersInfo(SPI_GETFLATMENU, 0, &bFlatMenus, 0);
         AdjustForTheme(bFlatMenus);
         BOOL bFlatMenus;
         SystemParametersInfo(SPI_GETFLATMENU, 0, &bFlatMenus, 0);
         AdjustForTheme(bFlatMenus);

+
+        if (m_staticToolbar)
+            m_staticToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+
+        if (m_SFToolbar)
+            m_SFToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult);
+

         return S_OK;
     }
 
         return S_OK;
     }
 

diff --git a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index 9a1a967..38f8b62 100644 (file)
--- a/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/reactos/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -113,6 +113,11 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
             return S_OK;
         }
         return S_FALSE;
             return S_OK;
         }
         return S_FALSE;

+    case WM_WININICHANGE:
+        if (wParam == SPI_SETFLATMENU)
+        {
+            SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0);
+        }

     }
 
     return S_FALSE;
     }
 
     return S_FALSE;