X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2afb9e169048b77a41c63b4f4eea3b10daee641a..5db61e875fe413739fd5c28b6373bdbc1ab9c93c:/src/mac/carbon/msgdlg.cpp?ds=sidebyside diff --git a/src/mac/carbon/msgdlg.cpp b/src/mac/carbon/msgdlg.cpp index ade6197a84..9a6de9e120 100644 --- 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 wxPoint& pos) + const wxPoint& WXUNUSED(pos)) : wxMessageDialogBase(parent, message, caption, style) { m_yes = _("Yes"); @@ -75,13 +75,13 @@ int wxMessageDialog::ShowModal() 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) - alertType = kAlertCautionAlert; + alertType = kAlertNoteAlert; // work out what to display @@ -103,7 +103,6 @@ int wxMessageDialog::ShowModal() } -#if TARGET_API_MAC_OSX if ( !wxIsMainThread() ) { CFStringRef defaultButtonTitle = NULL; @@ -163,7 +162,6 @@ int wxMessageDialog::ShowModal() resultbutton = buttonId[exitButton]; } else -#endif { short result;