From 57a21e6c4577244bb02f7cb93cace3e98e65e5c3 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 7 Nov 2005 14:59:34 +0000
Subject: [PATCH] switch to a CoreFoundation based and thread-safe
implementation for message boxes for Mach-O builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/mac/carbon/msgdlg.cpp | 61 +++++++++++++++++++++++++++++++++++++--
1 file changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 315012b368..655d74bc43 100644
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -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 ;
}
--
2.47.2