Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid gtk_widget_get_pointer() with GTK+4

Browse Source
This commit is contained in:
Paul Cornett
2017-12-19 10:46:37 -08:00
parent de273046a4
commit 54bcf1b9b6
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/dataview.cpp
View File

@@ -3631,14 +3631,19 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag
delete m_dragDataObject; delete m_dragDataObject;
m_dragDataObject = NULL; m_dragDataObject = NULL;
#ifdef __WXGTK4__
return false;
#else
wxDataViewCtrl* const dvc = GetOwner(); wxDataViewCtrl* const dvc = GetOwner();
wxDataViewItem item(dvc->GTKPathToItem(path)); wxDataViewItem item(dvc->GTKPathToItem(path));
if ( !item ) if ( !item )
return FALSE; return FALSE;
wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, dvc, item); wxDataViewEvent event(wxEVT_DATAVIEW_ITEM_BEGIN_DRAG, dvc, item);
wxGCC_WARNING_SUPPRESS(deprecated-declarations)
gint x, y; gint x, y;
gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y); gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y);
wxGCC_WARNING_RESTORE()
event.SetPosition(x, y); event.SetPosition(x, y);
if (!m_owner->HandleWindowEvent( event )) if (!m_owner->HandleWindowEvent( event ))
return FALSE; return FALSE;
@@ -3653,6 +3658,7 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag
m_dragDataObject = obj; m_dragDataObject = obj;
return TRUE; return TRUE;
#endif
} }
gboolean gboolean