NO_DEFAULT support added

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

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 73548ad9f219a8478e3212e69e0017688b5f3d9b..6f1cfbfdc6e63f0cd449269a02a65a6f6757abd5 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -61,6 +61,7 @@ int wxMessageDialog::ShowModal()
                 
         param.movable = true;
         param.flags = 0 ;
                 
         param.movable = true;
         param.flags = 0 ;

+        param.version = kStdCFStringAlertVersionOne ;

         
         bool skipDialog = false ;
         
         
         bool skipDialog = false ;
         


@@ -72,7 +73,7 @@ int wxMessageDialog::ShowModal()
                 param.cancelText     = (CFStringRef) kAlertDefaultCancelText;
                 param.otherText     = cfNoString ;
                 param.helpButton     = false ;
                 param.cancelText     = (CFStringRef) kAlertDefaultCancelText;
                 param.otherText     = cfNoString ;
                 param.helpButton     = false ;

-                param.defaultButton = kAlertStdAlertOKButton;
+                param.defaultButton = m_dialogStyle & wxNO_DEFAULT ? kAlertStdAlertOtherButton : kAlertStdAlertOKButton;

                 param.cancelButton     = kAlertStdAlertCancelButton;
             }
             else
                 param.cancelButton     = kAlertStdAlertCancelButton;
             }
             else


@@ -81,7 +82,7 @@ int wxMessageDialog::ShowModal()
                 param.cancelText     = NULL;
                 param.otherText     = cfNoString ;
                 param.helpButton     = false ;
                 param.cancelText     = NULL;
                 param.otherText     = cfNoString ;
                 param.helpButton     = false ;

-                param.defaultButton = kAlertStdAlertOKButton;
+                param.defaultButton = m_dialogStyle & wxNO_DEFAULT ? kAlertStdAlertOtherButton : kAlertStdAlertOKButton;

                 param.cancelButton     = 0;
             }
         }
                 param.cancelButton     = 0;
             }
         }