X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1673e527f08395de6864b09540162ca409a3c28..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/msgdlg.cpp?ds=sidebyside diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp index 9a6de9e120..830efb6f27 100644 --- a/src/mac/carbon/msgdlg.cpp +++ b/src/mac/carbon/msgdlg.cpp @@ -18,6 +18,7 @@ #include "wx/app.h" #endif +#include "wx/thread.h" #include "wx/mac/uma.h" @@ -109,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, GetFont().GetEncoding() ); + wxCFStringRef cfText( msgtext, GetFont().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(), GetFont().GetEncoding() ); + wxCFStringRef cfYesString( m_yes.c_str(), GetFont().GetEncoding() ); + wxCFStringRef cfOKString( m_ok.c_str() , GetFont().GetEncoding()) ; + wxCFStringRef cfCancelString( m_cancel.c_str(), GetFont().GetEncoding() ); int buttonId[4] = { 0, 0, 0, wxID_CANCEL /* time-out */ }; @@ -166,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(), GetFont().GetEncoding() ); + wxCFStringRef cfYesString( m_yes.c_str(), GetFont().GetEncoding() ); + wxCFStringRef cfOKString( m_ok.c_str(), GetFont().GetEncoding() ); + wxCFStringRef cfCancelString( m_cancel.c_str(), GetFont().GetEncoding() ); - wxMacCFStringHolder cfTitle( msgtitle, m_font.GetEncoding() ); - wxMacCFStringHolder cfText( msgtext, m_font.GetEncoding() ); + wxCFStringRef cfTitle( msgtitle, GetFont().GetEncoding() ); + wxCFStringRef cfText( msgtext, GetFont().GetEncoding() ); param.movable = true; param.flags = 0;