X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66506259a04a70a22db44dd6adee0f8aad36fab5..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/osx/carbon/msgdlg.cpp diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp index a95138112e..b0671595c9 100644 --- a/src/osx/carbon/msgdlg.cpp +++ b/src/osx/carbon/msgdlg.cpp @@ -30,7 +30,7 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& caption, long style, const wxPoint& WXUNUSED(pos)) - : wxMessageDialogWithCustomLabels(parent, message, caption, style) + : wxMessageDialogBase(parent, message, caption, style) { } @@ -69,8 +69,8 @@ int wxMessageDialog::ShowModal() // // if the extended text is not empty we ignore the caption // and use the message and the extended message - - + + wxString msgtitle,msgtext; if(m_extendedMessage.IsEmpty()) { @@ -216,7 +216,9 @@ int wxMessageDialog::ShowModal() { DialogRef alertRef; CreateStandardAlert( alertType, cfTitle, cfText, ¶m, &alertRef ); + wxDialog::OSXBeginModalDialog(); RunStandardAlert( alertRef, NULL, &result ); + wxDialog::OSXEndModalDialog(); } else { @@ -264,7 +266,7 @@ int wxMessageDialog::ShowModal() } } } - + SetReturnCode(resultbutton); return resultbutton;