switch to a CoreFoundation based and thread-safe implementation for message boxes...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 315012b368d53923a214693660bb77ab1e71bc40..655d74bc43e0da80e3091d4fe0d271b22d881605 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -31,8 +31,6 @@ int wxMessageDialog::ShowModal()
 {
     int resultbutton = wxID_CANCEL ;
 
 {
     int resultbutton = wxID_CANCEL ;
 

-    short result ;
-

     const long style = GetMessageDialogStyle();
 
     wxASSERT_MSG( ( style & 0x3F ) != wxYES , wxT("this style is not supported on mac") ) ;
     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 ;
 
     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 )
     {
 #if TARGET_CARBON
     if ( UMAGetSystemVersion() >= 0x1000 )
     {


@@ -255,7 +309,8 @@ int wxMessageDialog::ShowModal()
             }
         }
     }
             }
         }
     }

-
+#endif
+    

     return resultbutton ;
 }
 
     return resultbutton ;
 }