making the width of the popup button dependent from the window variant, adding a...

[wxWidgets.git] / src / mac / carbon / utils.cpp

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index f9b1d82641fff45165a286e483e04ddbf7db09b2..180fb5004b11034b433536f1a7b60ef85a528e08 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -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 )