X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/gtk1/dialog.cpp diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index 1646b771cb..c760fe0de2 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -19,6 +19,7 @@ #endif // WX_PRECOMP #include "wx/evtloop.h" +#include "wx/modalhook.h" #include #include @@ -137,7 +138,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 ); HandleWindowEvent(cancelEvent); s_closing.DeleteObject(this); @@ -182,6 +183,8 @@ void wxDialog::SetModal( bool WXUNUSED(flag) ) int wxDialog::ShowModal() { + WX_HOOK_MODAL_DIALOG(); + if (IsModal()) { wxFAIL_MSG( wxT("wxDialog:ShowModal called twice") );