Clean up indentation / tabs from previous patch

[wxWidgets.git] / src / mac / carbon / msgdlg.cpp

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index 5250cb51cf40c4f5ad5dad805a4f0d6bfa709e2e..e0f43288d4d2416360cf90d221437dffd667d0cd 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -6,13 +6,15 @@
 // Created:     04/01/98
 // RCS-ID:      $$
 // Copyright:   (c) Stefan Csomor
 // Created:     04/01/98
 // RCS-ID:      $$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWidgets licence
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "msgdlg.h"
 #endif
 
 #pragma implementation "msgdlg.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/app.h"
 #include "wx/msgdlg.h"
 #include "wx/intl.h"
 #include "wx/app.h"
 #include "wx/msgdlg.h"
 #include "wx/intl.h"


@@ -61,6 +63,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 +75,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 +84,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;
             }
         }