X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..f944aec0cf131c1be0b8c127ba1ecdbc8410c9b2:/src/gtk1/dialog.cpp?ds=sidebyside diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index eab01d62fd..f791d2d087 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -14,10 +14,10 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/frame.h" + #include "wx/cursor.h" #endif // WX_PRECOMP -#include "wx/frame.h" -#include "wx/cursor.h" #include "wx/evtloop.h" #include @@ -141,7 +141,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); cancelEvent.SetEventObject( this ); - GetEventHandler()->ProcessEvent(cancelEvent); + HandleWindowEvent(cancelEvent); s_closing.DeleteObject(this); } @@ -194,7 +194,7 @@ int wxDialog::ShowModal() wxWindow *parent = wxTheApp->GetTopWindow(); if ( parent && parent != this && - parent->IsBeingDeleted() && + !parent->IsBeingDeleted() && !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) ) { m_parent = parent;