Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/stubs/toolbar.cpp b/src/stubs/toolbar.cpp
index 61f34c8283ffae66e34e70426988a10fdcc434b0..b83ce5e0e8bcd65788ccf38b4240648da0db7a62 100644 (file)
--- a/src/stubs/toolbar.cpp
+++ b/src/stubs/toolbar.cpp
@@ -13,25 +13,13 @@
 #pragma implementation "toolbar.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx.h"
-#endif
-
+#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()
 {
@@ -105,7 +93,6 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         tool->m_enabled = enable;
         // TODO enable button
     }
-  }
 }
 
 void wxToolBar::ToggleTool(int toolIndex, bool toggle)
@@ -135,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)