clarified wxRect::Contains(wxRect) comment

[wxWidgets.git] / src / gtk1 / dialog.cpp

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 67f0984c0881b327c56f5250ef7359b43c9885e0..90c46a9ff8f25fd7cb673e2be9459681bdf77c26 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -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);
 }
 
@@ -192,10 +192,8 @@ int wxDialog::ShowModal()
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
         wxWindow *parent = wxTheApp->GetTopWindow();
-        if ( parent &&
-                parent != this &&
-                    parent->IsBeingDeleted() &&
-                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+        wxWindow * const parent = GetParentForModalDialog();
+        if ( parent && parent != this )
         {
             m_parent = parent;
             gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );