X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=base%2Fshell%2Frshell%2FCMenuToolbars.cpp;h=030ea983521d2b2f78d64973b65badfa37243b1b;hp=da1b663a31ff1cbc7b8e20709279543cc5e2bc59;hb=5ee1aff4f535c93aa832bcbeca57ee52df5e6325;hpb=2902b1cf0ca128593863fd93830a5b1b39515092

diff --git a/base/shell/rshell/CMenuToolbars.cpp b/base/shell/rshell/CMenuToolbars.cpp
index da1b663a31f..030ea983521 100644
--- a/base/shell/rshell/CMenuToolbars.cpp
+++ b/base/shell/rshell/CMenuToolbars.cpp
@@ -64,6 +64,13 @@ HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow)
 {
     ::ShowWindow(m_hwnd, fShow ? SW_SHOW : SW_HIDE);
 
+    UpdateImageLists();
+
+    return S_OK;
+}
+
+HRESULT CMenuToolbarBase::UpdateImageLists()
+{
     int shiml;
     if (m_menuBand->UseBigIcons())
     {
@@ -85,7 +92,6 @@ HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow)
     {
         SendMessageW(m_hwndToolbar, TB_SETIMAGELIST, 0, 0);
     }
-
     return S_OK;
 }
 
@@ -163,31 +169,12 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
     //    SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0);
     //}
     //else
-    int shiml;
-    if (m_menuBand->UseBigIcons())
-    {
-        shiml = SHIL_LARGE;
-        SendMessageW(hwndToolbar, TB_SETPADDING, 0, MAKELPARAM(0, 0));
-    }
-    else
-    {
-        shiml = SHIL_SMALL;
-    }
-
-    IImageList * piml;
-    HRESULT hr = SHGetImageList(shiml, IID_PPV_ARG(IImageList, &piml));
-    if (SUCCEEDED(hr))
-    {
-        SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, reinterpret_cast<LPARAM>(piml));
-    }
-    else
-    {
-        SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, 0);
-    }
 
     SetWindowLongPtr(hwndToolbar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
     m_SubclassOld = (WNDPROC) SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc));
 
+    UpdateImageLists();
+
     return S_OK;
 }