X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c07d8b324d9856c3381433938f9c21a77aa8a5f..2cf3a6d7bef6f20bea35062dd3d4dbf0aec9efb5:/src/mac/carbon/toolbar.cpp

diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp
index 11fae3b2ff..b4702c6daf 100644
--- a/src/mac/carbon/toolbar.cpp
+++ b/src/mac/carbon/toolbar.cpp
@@ -13,10 +13,12 @@
 
 #if wxUSE_TOOLBAR
 
-#include "wx/wx.h"
-#include "wx/bitmap.h"
 #include "wx/toolbar.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
 #include "wx/mac/uma.h"
 #include "wx/geometry.h"
 
@@ -907,7 +909,7 @@ bool wxToolBar::Realize()
                         if (err != noErr)
                         {
                             wxString errMsg = wxString::Format( wxT("HIToolbarRemoveItemAtIndex failed [%ld]"), (long)err );
-                            wxASSERT_MSG( 0, errMsg.c_str() );
+                            wxFAIL_MSG( errMsg.c_str() );
                         }
                     }
 
@@ -915,7 +917,7 @@ bool wxToolBar::Realize()
                     if (err != noErr)
                     {
                         wxString errMsg = wxString::Format( wxT("HIToolbarInsertItemAtIndex failed [%ld]"), (long)err );
-                        wxASSERT_MSG( 0, errMsg.c_str() );
+                        wxFAIL_MSG( errMsg.c_str() );
                     }
 
                     tool->SetIndex( currentPosition );
@@ -1265,7 +1267,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), wxToolBarToolBase *toolBase)
     else
     {
         wxString errMsg = wxString::Format( wxT("wxToolBar::DoInsertTool - failure [%ld]"), (long)err );
-        wxASSERT_MSG( false, errMsg.c_str() );
+        wxFAIL_MSG( errMsg.c_str() );
     }
 
     return (err == noErr);