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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index bf92673cbeb5adad53d44441b5d853496e47ba84..bec8295d8b35b0f39f4e3037f7f48e18af843b30 100644 (file)
--- 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 ee9764f77a18043c34bedcd4db430548b746f3ca..a892614cb15f586fc1183006a016bf820fc15032 100644 (file)
--- 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 ee9764f77a18043c34bedcd4db430548b746f3ca..a892614cb15f586fc1183006a016bf820fc15032 100644 (file)
--- 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() );