X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/21f4383ae7aa404e3d4ddb8f67d2705c54338e44..7291c37aa8f406b9487963a1b7fd6ee45b2e0b34:/src/gtk/dialog.cpp?ds=inline diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index 445afaf5ae..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, @@ -73,12 +70,16 @@ bool wxDialog::Create( wxWindow *parent, { 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) );