warning fix

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

diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp
index ade6197a84faffd33af9cbe026465e1f41bfcdd1..9a6de9e120abb2e0fc70a443274fe8c122d05fbc 100644 (file)
--- a/src/mac/carbon/msgdlg.cpp
+++ b/src/mac/carbon/msgdlg.cpp
@@ -28,7 +28,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  const wxString& message,
                                  const wxString& caption,
                                  long style,
                                  const wxString& message,
                                  const wxString& caption,
                                  long style,

-                                 const wxPoint& pos)
+                                 const wxPoint& WXUNUSED(pos))

                : wxMessageDialogBase(parent, message, caption, style)
 {
     m_yes = _("Yes");
                : wxMessageDialogBase(parent, message, caption, style)
 {
     m_yes = _("Yes");


@@ -75,13 +75,13 @@ int wxMessageDialog::ShowModal()
 
     AlertType alertType = kAlertPlainAlert;
     if (style & wxICON_EXCLAMATION)
 
     AlertType alertType = kAlertPlainAlert;
     if (style & wxICON_EXCLAMATION)

-        alertType = kAlertNoteAlert;
+        alertType = kAlertCautionAlert;

     else if (style & wxICON_HAND)
         alertType = kAlertStopAlert;
     else if (style & wxICON_INFORMATION)
         alertType = kAlertNoteAlert;
     else if (style & wxICON_QUESTION)
     else if (style & wxICON_HAND)
         alertType = kAlertStopAlert;
     else if (style & wxICON_INFORMATION)
         alertType = kAlertNoteAlert;
     else if (style & wxICON_QUESTION)

-        alertType = kAlertCautionAlert;
+        alertType = kAlertNoteAlert;

 
 
     // work out what to display
 
 
     // work out what to display


@@ -103,7 +103,6 @@ int wxMessageDialog::ShowModal()
     }
 
 
     }
 
 

-#if TARGET_API_MAC_OSX

     if ( !wxIsMainThread() )
     {
         CFStringRef defaultButtonTitle = NULL;
     if ( !wxIsMainThread() )
     {
         CFStringRef defaultButtonTitle = NULL;


@@ -163,7 +162,6 @@ int wxMessageDialog::ShowModal()
             resultbutton = buttonId[exitButton];
     }
     else
             resultbutton = buttonId[exitButton];
     }
     else

-#endif

     {
         short result;
 
     {
         short result;