X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3591d10f4fe21b0e1a355d0b31b363ff528e6732..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/gtk/popupwin.cpp

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index 38ac3c14f4..32e440006b 100644
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -46,7 +46,7 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
         {
             if (child == widget)
                 return FALSE;
-            child = child->parent;
+            child = gtk_widget_get_parent(child);
         }
     }
 
@@ -114,12 +114,17 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
     g_object_ref( m_widget );
 
     gtk_widget_set_name( m_widget, "wxPopupWindow" );
-    gtk_window_set_type_hint( GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_COMBO );
+    // wxPopupWindow is used for different windows as well
+    // gtk_window_set_type_hint( GTK_WINDOW(m_widget), GDK_WINDOW_TYPE_HINT_COMBO );
 
     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);
@@ -205,7 +210,7 @@ void wxPopupWindow::SetFocus()
             return;
         }
     }
-    
+
     wxPopupWindowBase::SetFocus();
 }