Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch to a CoreFoundation based and thread-safe implementation for message boxes for Mach-O builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-11-07 14:59:34 +00:00
parent fb5246bead
commit 57a21e6c45
1 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/mac/carbon/msgdlg.cpp
View File

@@ -31,8 +31,6 @@ int wxMessageDialog::ShowModal()
{
int resultbutton = wxID_CANCEL ;
short result ;
const long style = GetMessageDialogStyle();
wxASSERT_MSG( ( style & 0x3F ) != wxYES , wxT("this style is not supported on mac") ) ;
@@ -47,6 +45,62 @@ int wxMessageDialog::ShowModal()
else if (style & wxICON_QUESTION)
alertType = kAlertCautionAlert ;
#if TARGET_API_MAC_OSX
CFStringRef defaultButtonTitle = NULL ;
CFStringRef alternateButtonTitle = NULL ;
CFStringRef otherButtonTitle = NULL ;
wxMacCFStringHolder cfTitle(m_caption , m_font.GetEncoding());
wxMacCFStringHolder cfText(m_message , m_font.GetEncoding());
wxMacCFStringHolder cfNoString(_("No") , m_font.GetEncoding()) ;
wxMacCFStringHolder cfYesString( _("Yes") , m_font.GetEncoding()) ;
wxMacCFStringHolder cfCancelString( _("Cancel") , m_font.GetEncoding()) ;
int buttonId[4] = { 0 , 0 , 0 , wxID_CANCEL /* time-out */ } ;
if (style & wxYES_NO)
{
if ( style & wxNO_DEFAULT )
{
defaultButtonTitle = cfNoString ;
alternateButtonTitle = cfYesString ;
buttonId[0] = wxID_NO ;
buttonId[1] = wxID_YES ;
}
else
{
defaultButtonTitle = cfYesString ;
alternateButtonTitle = cfNoString ;
buttonId[0] = wxID_YES ;
buttonId[1] = wxID_NO ;
}
if (style & wxCANCEL)
{
otherButtonTitle = cfCancelString ;
buttonId[2] = wxID_CANCEL ;
}
}
else
{
// the msw implementation even shows an ok button if it is not specified, we'll do the same
buttonId[0] = wxID_OK ;
if (style & wxCANCEL)
{
alternateButtonTitle = cfCancelString ;
buttonId[1] = wxID_CANCEL ;
}
}
CFOptionFlags exitButton ;
OSStatus err = CFUserNotificationDisplayAlert ( 0 , alertType , NULL , NULL , NULL , cfTitle , cfText ,
defaultButtonTitle , alternateButtonTitle , otherButtonTitle , &exitButton );
if ( err == noErr )
resultbutton = buttonId[exitButton] ;
#else
short result ;
#if TARGET_CARBON
if ( UMAGetSystemVersion() >= 0x1000 )
{
@@ -255,7 +309,8 @@ int wxMessageDialog::ShowModal()
}
}
}
#endif
return resultbutton ;
}