X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/451673f7c982d9410c7ef799c6c47c8cacfed1d6..8e2c6c3f7d3846883f20754a84d03866057df427:/src/gtk/popupwin.cpp?ds=sidebyside diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp index 641a9248ea..17d0671e93 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); } } @@ -73,14 +73,6 @@ bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED } } -void wxPopupWindow::AddChildGTK(wxWindowGTK* child) -{ - gtk_widget_set_size_request( - child->m_widget, child->m_width, child->m_height); - gtk_fixed_put( - GTK_FIXED(m_wxwindow), child->m_widget, child->m_x, child->m_y); -} - //----------------------------------------------------------------------------- // wxPopupWindow //----------------------------------------------------------------------------- @@ -124,7 +116,7 @@ bool wxPopupWindow::Create( wxWindow *parent, int style ) 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); @@ -210,7 +202,7 @@ void wxPopupWindow::SetFocus() return; } } - + wxPopupWindowBase::SetFocus(); }