Call Dismiss rather than Show(false) on the infobar to correct the layout.

[wxWidgets.git] / src / gtk / popupwin.cpp

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index ec300200c611064f3626ae87785de660f3243802..32e440006b233a6e1b6210fcbeb46c82321cb238 100644 (file)
--- 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);
         }
     }
 
@@ -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);
@@ -206,7 +210,7 @@ void wxPopupWindow::SetFocus()
             return;
         }
     }
-    
+
     wxPopupWindowBase::SetFocus();
 }