diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/common/filefn.cpp wxWidgets-2.9.5/src/common/filefn.cpp
--- wxWidgets-2.9.5.orig/src/common/filefn.cpp	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/common/filefn.cpp	2017-11-04 14:17:53.000000000 -0400
@@ -910,7 +910,7 @@
     FSRef fsRef;
     wxMacPathToFSRef( path , &fsRef );
     err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
-    verify_noerr( err );
+    wxASSERT( 0 == err );
 }
 #endif
 
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/osx/carbon/icon.cpp wxWidgets-2.9.5/src/osx/carbon/icon.cpp
--- wxWidgets-2.9.5.orig/src/osx/carbon/icon.cpp	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/osx/carbon/icon.cpp	2017-11-04 14:17:53.000000000 -0400
@@ -280,7 +280,7 @@
     if ( theId != 0 )
     {
         IconRef iconRef = NULL ;
-        verify_noerr( GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
+        wxASSERT( 0 == GetIconRef( kOnSystemDisk, kSystemIconsCreator, theId, &iconRef ) ) ;
         if ( iconRef )
         {
             m_refData = new wxIconRefData( (WXHICON) iconRef, desiredWidth, desiredHeight ) ;
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/osx/carbon/region.cpp wxWidgets-2.9.5/src/osx/carbon/region.cpp
--- wxWidgets-2.9.5.orig/src/osx/carbon/region.cpp	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/osx/carbon/region.cpp	2017-11-04 14:17:53.000000000 -0400
@@ -1022,7 +1022,7 @@
 
     AllocExclusive();
 
-    verify_noerr( HIShapeOffset( M_REGION , x , y ) ) ;
+    wxASSERT( 0 == HIShapeOffset( M_REGION , x , y ) ) ;
 
     return true ;
 }
@@ -1077,11 +1077,11 @@
     switch (op)
     {
         case wxRGN_AND:
-            verify_noerr( HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
+            wxASSERT( 0 == HIShapeIntersect( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
             break ;
 
         case wxRGN_OR:
-            verify_noerr( HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
+            wxASSERT( 0 == HIShapeUnion( M_REGION , OTHER_M_REGION(region) , M_REGION ) );
             break ;
 
         case wxRGN_XOR:
@@ -1089,12 +1089,12 @@
                 // XOR is defined as the difference between union and intersection
                 wxCFRef< HIShapeRef > unionshape( HIShapeCreateUnion( M_REGION , OTHER_M_REGION(region) ) );
                 wxCFRef< HIShapeRef > intersectionshape( HIShapeCreateIntersection( M_REGION , OTHER_M_REGION(region) ) );
-                verify_noerr( HIShapeDifference( unionshape, intersectionshape, M_REGION ) );
+                wxASSERT( 0 == HIShapeDifference( unionshape, intersectionshape, M_REGION ) );
             }
             break ;
 
         case wxRGN_DIFF:
-            verify_noerr( HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ;
+            wxASSERT( 0 == HIShapeDifference( M_REGION , OTHER_M_REGION(region) , M_REGION ) ) ;
             break ;
 
         case wxRGN_COPY:
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/osx/carbon/thread.cpp wxWidgets-2.9.5/src/osx/carbon/thread.cpp
--- wxWidgets-2.9.5.orig/src/osx/carbon/thread.cpp	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/osx/carbon/thread.cpp	2017-11-04 14:17:54.000000000 -0400
@@ -164,7 +164,7 @@
     m_isOk = false;
     m_critRegion = kInvalidID;
 
-    verify_noerr( MPCreateCriticalRegion( &m_critRegion ) );
+    wxASSERT( 0 == MPCreateCriticalRegion( &m_critRegion ) );
     m_isOk = ( m_critRegion != kInvalidID );
     if ( !IsOk() )
     {
@@ -279,7 +279,7 @@
         // make it practically infinite
         maxcount = INT_MAX;
 
-    verify_noerr( MPCreateSemaphore( maxcount, initialcount, &m_semaphore ) );
+    wxASSERT( 0 == MPCreateSemaphore( maxcount, initialcount, &m_semaphore ) );
     m_isOk = ( m_semaphore != kInvalidID );
 
     if ( !IsOk() )
@@ -604,7 +604,7 @@
     wxThreadInternal *pthread = thread->m_internal;
 
     // add to TLS so that This() will work
-    verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread , (TaskStorageValue) thread ) ) ;
+    wxASSERT( 0 == MPSetTaskStorageValue( gs_tlsForWXThread , (TaskStorageValue) thread ) ) ;
 
     // have to declare this before pthread_cleanup_push() which defines a
     // block!
@@ -1220,8 +1220,8 @@
     }
 
     // main thread's This() is NULL
-    verify_noerr( MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
-    verify_noerr( MPSetTaskStorageValue( gs_tlsForWXThread, 0 ) ) ;
+    wxASSERT( 0 == MPAllocateTaskStorageIndex( &gs_tlsForWXThread ) ) ;
+    wxASSERT( 0 == MPSetTaskStorageValue( gs_tlsForWXThread, 0 ) ) ;
 
     wxThread::ms_idMainThread = wxThread::GetCurrentId();
     gs_critsectWaitingForGui = new wxCriticalSection();
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/osx/cocoa/notebook.mm wxWidgets-2.9.5/src/osx/cocoa/notebook.mm
--- wxWidgets-2.9.5.orig/src/osx/cocoa/notebook.mm	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/osx/cocoa/notebook.mm	2017-11-04 14:17:54.000000000 -0400
@@ -322,7 +322,7 @@
     OSStatus err = CreateTabsControl(
         MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
         tabsize, tabstyle, 0, NULL, GetPeer()->GetControlRefAddr() );
-    verify_noerr( err );
+    wxASSERT( 0 == err );
 #endif
 */
 wxWidgetImplType* wxWidgetImpl::CreateTabView( wxWindowMac* wxpeer,
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/osx/core/bitmap.cpp wxWidgets-2.9.5/src/osx/core/bitmap.cpp
--- wxWidgets-2.9.5.orig/src/osx/core/bitmap.cpp	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/osx/core/bitmap.cpp	2017-11-04 14:17:54.000000000 -0400
@@ -1065,7 +1065,7 @@
 IconRef wxBitmap::CreateIconRef() const
 {
     IconRef icon = GetIconRef();
-    verify_noerr( AcquireIconRef(icon) );
+    wxASSERT( 0 == AcquireIconRef(icon) );
     return icon;
 }
 #endif
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/osx/core/utilsexc_base.cpp wxWidgets-2.9.5/src/osx/core/utilsexc_base.cpp
--- wxWidgets-2.9.5.orig/src/osx/core/utilsexc_base.cpp	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/osx/core/utilsexc_base.cpp	2017-11-04 14:17:54.000000000 -0400
@@ -63,7 +63,7 @@
     static SInt32 sUMASystemVersion = 0 ;
     if ( sUMASystemVersion == 0 )
     {
-        verify_noerr(Gestalt(gestaltSystemVersion, &sUMASystemVersion));
+        wxASSERT( 0 == Gestalt(gestaltSystemVersion, &sUMASystemVersion) );
     }
     return sUMASystemVersion ;
 }
diff -Nurd -x'*~' wxWidgets-2.9.5.orig/src/stc/scintilla/src/Editor.cxx wxWidgets-2.9.5/src/stc/scintilla/src/Editor.cxx
--- wxWidgets-2.9.5.orig/src/stc/scintilla/src/Editor.cxx	2013-07-16 11:47:14.000000000 -0400
+++ wxWidgets-2.9.5/src/stc/scintilla/src/Editor.cxx	2017-11-04 13:54:23.000000000 -0400
@@ -11,6 +11,7 @@
 #include <ctype.h>
 #include <assert.h>
 
+#include <cmath>
 #include <string>
 #include <vector>
 #include <map>
