X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/204abcd474fa99071b7bb5b00f7e212b0bde16dc..99c75ebc5e447e1bb25439e22f07130583dc5783:/src/mac/carbon/msgdlg.cpp diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp index a7a347456a..4faaa6e3aa 100644 --- a/src/mac/carbon/msgdlg.cpp +++ b/src/mac/carbon/msgdlg.cpp @@ -110,13 +110,13 @@ int wxMessageDialog::ShowModal() CFStringRef alternateButtonTitle = NULL; CFStringRef otherButtonTitle = NULL; - wxMacCFStringHolder cfTitle( msgtitle, m_font.GetEncoding() ); - wxMacCFStringHolder cfText( msgtext, m_font.GetEncoding() ); + wxCFStringRef cfTitle( msgtitle, m_font.GetEncoding() ); + wxCFStringRef cfText( msgtext, m_font.GetEncoding() ); - wxMacCFStringHolder cfNoString( m_no.c_str(), m_font.GetEncoding() ); - wxMacCFStringHolder cfYesString( m_yes.c_str(), m_font.GetEncoding() ); - wxMacCFStringHolder cfOKString( m_ok.c_str() , m_font.GetEncoding()) ; - wxMacCFStringHolder cfCancelString( m_cancel.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfNoString( m_no.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfYesString( m_yes.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfOKString( m_ok.c_str() , m_font.GetEncoding()) ; + wxCFStringRef cfCancelString( m_cancel.c_str(), m_font.GetEncoding() ); int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ }; @@ -167,13 +167,13 @@ int wxMessageDialog::ShowModal() short result; AlertStdCFStringAlertParamRec param; - wxMacCFStringHolder cfNoString( m_no.c_str(), m_font.GetEncoding() ); - wxMacCFStringHolder cfYesString( m_yes.c_str(), m_font.GetEncoding() ); - wxMacCFStringHolder cfOKString( m_ok.c_str(), m_font.GetEncoding() ); - wxMacCFStringHolder cfCancelString( m_cancel.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfNoString( m_no.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfYesString( m_yes.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfOKString( m_ok.c_str(), m_font.GetEncoding() ); + wxCFStringRef cfCancelString( m_cancel.c_str(), m_font.GetEncoding() ); - wxMacCFStringHolder cfTitle( msgtitle, m_font.GetEncoding() ); - wxMacCFStringHolder cfText( msgtext, m_font.GetEncoding() ); + wxCFStringRef cfTitle( msgtitle, m_font.GetEncoding() ); + wxCFStringRef cfText( msgtext, m_font.GetEncoding() ); param.movable = true; param.flags = 0;