From 54bcf1b9b6d1490b7d2050d86b259d0e76700b25 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 19 Dec 2017 10:46:37 -0800 Subject: [PATCH] Avoid gtk_widget_get_pointer() with GTK+4 --- src/gtk/dataview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 3683bd3e0e..6e102ae7c4 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -3631,14 +3631,19 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag delete m_dragDataObject; m_dragDataObject = NULL; +#ifdef __WXGTK4__ + return false; +#else wxDataViewCtrl* const dvc = GetOwner(); wxDataViewItem item(dvc->GTKPathToItem(path)); if ( !item ) return FALSE; wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, dvc, item); + wxGCC_WARNING_SUPPRESS(deprecated-declarations) gint x, y; gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y); + wxGCC_WARNING_RESTORE() event.SetPosition(x, y); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3653,6 +3658,7 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag m_dragDataObject = obj; return TRUE; +#endif } gboolean