]> git.saurik.com Git - wxWidgets.git/commitdiff
Avoid an assert in wxFrame::SetTitle
authorRobin Dunn <robin@alldunn.com>
Fri, 23 Jul 2004 18:31:48 +0000 (18:31 +0000)
committerRobin Dunn <robin@alldunn.com>
Fri, 23 Jul 2004 18:31:48 +0000 (18:31 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/utils.cpp

index f9b1d82641fff45165a286e483e04ddbf7db09b2..180fb5004b11034b433536f1a7b60ef85a528e08 100644 (file)
@@ -1735,7 +1735,14 @@ void wxMacControl::GetBestRect( Rect *r )
 
 void wxMacControl::SetTitle( const wxString &title ) 
 {
-    UMASetControlTitle(  m_controlRef , title , m_font.GetEncoding() ) ;
+    wxFontEncoding encoding;
+
+    if ( m_font.Ok() )
+        encoding = m_font.GetEncoding();
+    else
+        encoding = wxFont::GetDefaultEncoding();
+    
+    UMASetControlTitle(  m_controlRef , title , encoding ) ;
 }
 
 void wxMacControl::GetFeatures( UInt32 * features )