From 763809100c875160780b15e0f406bbe2d802ec64 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 3 Nov 1999 14:24:42 +0000 Subject: [PATCH] wxDialog now stays on top of its parent. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/dialogs/dialogs.cpp | 2 +- src/gtk/dialog.cpp | 3 +++ src/gtk1/dialog.cpp | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index bf92673cbe..bec8295d8b 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -193,7 +193,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) void MyFrame::MessageBox(wxCommandEvent& WXUNUSED(event) ) { - wxMessageDialog dialog(NULL, "This is a message box\nA long, long string to test out the message box properly", + wxMessageDialog dialog( this, "This is a message box\nA long, long string to test out the message box properly", "Message box text", wxYES_NO|wxCANCEL|wxICON_INFORMATION); dialog.ShowModal(); diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp index ee9764f77a..a892614cb1 100644 --- a/src/gtk/dialog.cpp +++ b/src/gtk/dialog.cpp @@ -261,6 +261,9 @@ bool wxDialog::Create( wxWindow *parent, m_widget = gtk_window_new( GTK_WINDOW_DIALOG ); + if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget))) + gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); + if (!name.IsEmpty()) gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp index ee9764f77a..a892614cb1 100644 --- a/src/gtk1/dialog.cpp +++ b/src/gtk1/dialog.cpp @@ -261,6 +261,9 @@ bool wxDialog::Create( wxWindow *parent, m_widget = gtk_window_new( GTK_WINDOW_DIALOG ); + if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget))) + gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) ); + if (!name.IsEmpty()) gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() ); -- 2.47.2