made unzip.c accept / and \ in filenames as equal

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

diff --git a/src/stubs/toolbar.cpp b/src/stubs/toolbar.cpp
index ab0ace8901183607a2cf0e4f8457f5429c15e23a..b83ce5e0e8bcd65788ccf38b4240648da0db7a62 100644 (file)
--- a/src/stubs/toolbar.cpp
+++ b/src/stubs/toolbar.cpp
@@ -16,12 +16,10 @@
 #include "wx/wx.h"
 #include "wx/toolbar.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarBase)
 
 BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
 END_EVENT_TABLE()
-#endif
 
 wxToolBar::wxToolBar()
 {
@@ -124,7 +122,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 *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)