X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62d934aab8dd395ee4b9377de6c22fcbf774b0db..b3eb776ad6e73ff50d3d75e3b7c8f418154feae6:/src/gtk/popupwin.cpp?ds=inline diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index ec300200c6..dd0fd634e5 100644 --- a/src/gtk/popupwin.cpp +++ b/src/gtk/popupwin.cpp @@ -120,7 +120,11 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) GtkWidget *toplevel = gtk_widget_get_toplevel( parent->m_widget ); if (GTK_IS_WINDOW (toplevel)) { - gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget)); +#if GTK_CHECK_VERSION(2,10,0) + if (!gtk_check_version(2,10,0)) + gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)), GTK_WINDOW (m_widget)); +#endif + gtk_window_set_transient_for (GTK_WINDOW (m_widget), GTK_WINDOW (toplevel)); } gtk_window_set_resizable (GTK_WINDOW (m_widget), FALSE); @@ -129,7 +133,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) g_signal_connect (m_widget, "delete_event", G_CALLBACK (gtk_dialog_delete_callback), this); - m_wxwindow = wxPizza::New(m_windowStyle); + m_wxwindow = wxPizza::New(m_windowStyle, this); gtk_widget_show( m_wxwindow ); gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );