From 4583eae4f7864f9596658a1156548840249f8908 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Thu, 11 Mar 2021 17:51:33 +0900
Subject: [PATCH] [SHELL32] Fix CMenuToolbarBase

CORE-17505
---
 dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 2 +-
 dll/win32/shell32/shellmenu/CMenuToolbars.h   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index 984be9ecfc7..b08097e02b0 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -263,7 +263,7 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
 }
 
 CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) :
-    m_pager(this, 1),
+    m_pager(WC_PAGESCROLLER, this),
     m_useFlatMenus(FALSE),
     m_disableMouseTrack(FALSE),
     m_timerEnabled(FALSE),
diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.h b/dll/win32/shell32/shellmenu/CMenuToolbars.h
index a7ecb45b0ed..6463166d258 100644
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.h
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.h
@@ -135,8 +135,6 @@ private:
         MESSAGE_HANDLER(WM_COMMAND, OnWinEventWrap)
         MESSAGE_HANDLER(WM_NOTIFY, OnWinEventWrap)
         MESSAGE_HANDLER(WM_TIMER, OnPopupTimer)
-    ALT_MSG_MAP(1)
-        // No pager specific handlers yet
     END_MSG_MAP()
 };