X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96524a0f6e44549b55c5adbbb90c8ee0d5419f1..c1aec196fc3e544d0188cfc975344887eeb10e0f:/src/mac/carbon/notebmac.cpp

diff --git a/src/mac/carbon/notebmac.cpp b/src/mac/carbon/notebmac.cpp
index 925e652b43..6d00a7130d 100644
--- a/src/mac/carbon/notebmac.cpp
+++ b/src/mac/carbon/notebmac.cpp
@@ -399,7 +399,7 @@ void wxNotebook::MacSetupTabs()
         page = m_pages[ii];
         info.version = kControlTabInfoVersionOne;
         info.iconSuiteID = 0;
-        wxCFStringRef cflabel( page->GetLabel(), m_font.GetEncoding() ) ;
+        wxCFStringRef cflabel( page->GetLabel(), GetFont().GetEncoding() ) ;
         info.name = cflabel ;
         m_peer->SetData<ControlTabInfoRecV1>( ii + 1, kControlTabInfoTag, &info ) ;
 
@@ -413,7 +413,10 @@ void wxNotebook::MacSetupTabs()
                 wxMacCreateBitmapButton( &info, bmap ) ;
 
                 OSStatus err = m_peer->SetData<ControlButtonContentInfo>( ii + 1, kControlTabImageContentTag, &info );
-                wxASSERT_MSG( err == noErr , wxT("Error when setting icon on tab") ) ;
+                if ( err != noErr )
+                {
+                    wxFAIL_MSG("Error when setting icon on tab");
+                }
 
                 wxMacReleaseBitmapButton( &info ) ;
             }