From 10a59880771fae005b31e003916a028267b54427 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 23 Jul 2004 18:31:48 +0000 Subject: [PATCH] Avoid an assert in wxFrame::SetTitle git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/utils.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index f9b1d82641..180fb5004b 100644 --- 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 )