From 1dbe87089bfd7d85fcc584f832ce61a94fc16082 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 15 Dec 1999 19:49:48 +0000 Subject: [PATCH] small compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/tbarmsw.h | 2 +- src/msw/tbarmsw.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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; -- 2.50.0