Use toplevel parent rather than immediate parent as color dialog's parent window

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp
index 448f347a386c1bfe7cf79e433b65b7644c6ff590..8571dab73e1a1cb73031682d106ce01dfb90fa13 100644 (file)
--- a/src/gtk/colordlg.cpp
+++ b/src/gtk/colordlg.cpp
@@ -42,8 +42,11 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
 
     if (parent)
+    {
+        GtkWindow* gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
-                                     GTK_WINDOW(parent->m_widget));
+                                     gtk_parent);
+    }
 
     GtkColorSelection *sel =
         GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);

diff --git a/src/gtk1/colordlg.cpp b/src/gtk1/colordlg.cpp
index 448f347a386c1bfe7cf79e433b65b7644c6ff590..8571dab73e1a1cb73031682d106ce01dfb90fa13 100644 (file)
--- a/src/gtk1/colordlg.cpp
+++ b/src/gtk1/colordlg.cpp
@@ -42,8 +42,11 @@ bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
     m_widget = gtk_color_selection_dialog_new(wxGTK_CONV(title));
 
     if (parent)
+    {
+        GtkWindow* gtk_parent = GTK_WINDOW( gtk_widget_get_toplevel(parent->m_widget) );
         gtk_window_set_transient_for(GTK_WINDOW(m_widget),
-                                     GTK_WINDOW(parent->m_widget));
+                                     gtk_parent);
+    }
 
     GtkColorSelection *sel =
         GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(m_widget)->colorsel);