Added makeg295.env file for building with gcc-2.95/mingw

[wxWidgets.git] / src / stubs / toolbar.cpp

diff --git a/src/stubs/toolbar.cpp b/src/stubs/toolbar.cpp
index ab0ace8901183607a2cf0e4f8457f5429c15e23a..3cb859e3663f8890c53ac03a83946a4211578515 100644 (file)
--- a/src/stubs/toolbar.cpp
+++ b/src/stubs/toolbar.cpp
@@ -124,7 +124,7 @@ void wxToolBar::ClearTools()
 wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
              bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
 {
 wxToolBarTool *wxToolBar::AddTool(int index, const wxBitmap& bitmap, const wxBitmap& pushedBitmap,
              bool toggle, long xPos, long yPos, wxObject *clientData, const wxString& helpString1, const wxString& helpString2)
 {

-  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, (wxBitmap *)NULL, toggle, xPos, yPos, helpString1, helpString2);
+  wxToolBarTool *tool = new wxToolBarTool(index, bitmap, wxNullBitmap, toggle, xPos, yPos, helpString1, helpString2);

   tool->m_clientData = clientData;
 
   if (xPos > -1)
   tool->m_clientData = clientData;
 
   if (xPos > -1)