diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index ed88e668d2..d03dbe7ff3 100644
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -110,7 +110,7 @@ protected:
     void CreateMask(WXHDC hDC, int xoffset, int yoffset, int dx, int dy);
     void DrawBlankButton(WXHDC hdc, int x, int y, int dx, int dy, int state);
     void DrawButton(WXHDC hdc, int x, int y, int dx, int dy,
-                    wxToolBarTool *tool, int state);
+                    wxToolBarToolBase *tool, int state);
     WXHBITMAP CreateDitherBitmap();
     bool CreateDitherBrush();
     bool FreeDitherBrush();
diff --git a/src/msw/tbarmsw.cpp b/src/msw/tbarmsw.cpp
index e7ab1de5c8..50410b00f8 100644
--- a/src/msw/tbarmsw.cpp
+++ b/src/msw/tbarmsw.cpp
@@ -747,8 +747,11 @@ void wxToolBar::DrawBlankButton(WXHDC hdc, int x, int y, int dx, int dy, int sta
     }
 }
 
-void wxToolBar::DrawButton(WXHDC hdc, int x, int y, int dx, int dy, wxToolBarTool *tool, int state)
+void wxToolBar::DrawButton(WXHDC hdc, int x, int y, int dx, int dy,
+                           wxToolBarToolBase *toolBase, int state)
 {
+    wxToolBarTool *tool = (wxToolBarTool *)toolBase;
+
     int yOffset;
     HBRUSH hbrOld, hbr;
     BOOL bMaskCreated = FALSE;