From fa349e95cc0dac7b982b2a131526b751456f3e26 Mon Sep 17 00:00:00 2001 From: Kevin Hock Date: Thu, 3 Nov 2005 02:50:00 +0000 Subject: [PATCH] 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 --- src/gtk/colordlg.cpp | 5 ++++- src/gtk1/colordlg.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index 448f347a38..8571dab73e 100644 --- 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 448f347a38..8571dab73e 100644 --- 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); -- 2.45.2