X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/445e564f120fb194a554ef70a6f2187b7ce693ed..47e175a24f862aa8b7ca7dd4a2bb5957991e7f2d:/src/osx/carbon/msgdlg.cpp?ds=sidebyside diff --git a/src/osx/carbon/msgdlg.cpp b/src/osx/carbon/msgdlg.cpp index bc410c3c03..808fbcc385 100644 --- a/src/osx/carbon/msgdlg.cpp +++ b/src/osx/carbon/msgdlg.cpp @@ -19,6 +19,7 @@ #endif #include "wx/thread.h" +#include "wx/testing.h" #include "wx/osx/uma.h" @@ -30,12 +31,14 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent, const wxString& caption, long style, const wxPoint& WXUNUSED(pos)) - : wxMessageDialogWithCustomLabels(parent, message, caption, style) + : wxMessageDialogBase(parent, message, caption, style) { } int wxMessageDialog::ShowModal() { + WX_TESTING_SHOW_MODAL_HOOK(); + int resultbutton = wxID_CANCEL; const long style = GetMessageDialogStyle(); @@ -69,8 +72,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()) { @@ -266,7 +269,7 @@ int wxMessageDialog::ShowModal() } } } - + SetReturnCode(resultbutton); return resultbutton;