X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e1f8ea4a3c2764ec89d95f4edef40257e32ac5b..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/univ/dialog.cpp diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index c8b9e7aa7d..4c9609f097 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -29,6 +29,7 @@ #endif #include "wx/evtloop.h" +#include "wx/modalhook.h" //----------------------------------------------------------------------------- // wxDialog @@ -128,7 +129,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) s_closing.Append(this); - wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); + wxCommandEvent cancelEvent(wxEVT_BUTTON, wxID_CANCEL); cancelEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(cancelEvent); s_closing.DeleteObject(this); @@ -165,6 +166,8 @@ bool wxDialog::IsModal() const int wxDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + if ( IsModal() ) { wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );