X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..6ecb30a36fe6c85e60a2d7c6ac2fbec6f0cf98b2:/src/stubs/toolbar.cpp diff --git a/src/stubs/toolbar.cpp b/src/stubs/toolbar.cpp index ab0ace8901..b83ce5e0e8 100644 --- 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)