X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d9f12f3b9f997b6308faf336d5381be591b71f4..b477f956e0421cb8d8e40635f4c372a0298fd739:/src/gtk/dialog.cpp

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 1b206e4a2d..68a991a371 100644
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -59,11 +59,8 @@ wxDialog::wxDialog( wxWindow *parent,
                     long style, const wxString &name )
 {
     Init();
-    
-    // all dialogs should have tab traversal enabled
-    style |= wxTAB_TRAVERSAL;
 
-    Create( parent, id, title, pos, size, style, name );
+    (void)Create( parent, id, title, pos, size, style, name );
 }
 
 bool wxDialog::Create( wxWindow *parent,
@@ -71,14 +68,18 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
-    SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG);
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;
 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {
-    if (Validate()) TransferDataFromWindow();
+    if (Validate())
+        TransferDataFromWindow();
 }
 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
@@ -197,7 +198,10 @@ int wxDialog::ShowModal()
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
         wxWindow *parent = wxTheApp->GetTopWindow();
-        if ( parent && parent != this )
+        if ( parent &&
+                parent != this &&
+                    parent->IsBeingDeleted() &&
+                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
         {
             m_parent = parent;
             gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );