[SHELL32] CMenuToolbarBase: Use COLOR_MENUTEXT color for the text color in normal...

[reactos.git] / dll / win32 / shell32 / shellmenu / CMenuToolbars.cpp

diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
index 3d046ba..909c5fb 100644 (file)
--- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
+++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp
@@ -105,8 +105,7 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
         case NM_TOOLTIPSCREATED:
             break;
 
-            // Unknown
-        case -714: return S_FALSE;
+        case TBN_DRAGOUT: return S_FALSE;
 
         default:
             TRACE("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom);
@@ -207,6 +206,9 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
         }
         else
         {
+            // Set the text color, will be used by the internal drawing code
+            cdraw->clrText = GetSysColor(COLOR_MENUTEXT);
+
             // Remove HOT and CHECKED flags (will restore HOT if necessary)
             cdraw->nmcd.uItemState &= ~CDIS_HOT;
 
@@ -256,7 +258,6 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu
 CMenuToolbarBase::CMenuToolbarBase(CMenuBand *menuBand, BOOL usePager) :
     m_pager(this, 1),
     m_useFlatMenus(FALSE),
-    m_SubclassOld(NULL),
     m_disableMouseTrack(FALSE),
     m_timerEnabled(FALSE),
     m_menuBand(menuBand),