From c1c9c2c5e557bbcf86fde3db0c3085f691100bc1 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Wed, 15 Nov 2017 10:52:21 -0800 Subject: [PATCH] Fix build with GTK+ 2.6 --- src/gtk/dataview.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index ddea2a5928..55e236dc81 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -4919,18 +4919,24 @@ void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item) wxDataViewItem wxDataViewCtrl::GetTopItem() const { +#if GTK_CHECK_VERSION(2,8,0) +#ifndef __WXGTK3__ + if (gtk_check_version(2,8,0)) + return wxDataViewItem(); +#endif wxGtkTreePath start; - if ( !gtk_tree_view_get_visible_range + if ( gtk_tree_view_get_visible_range ( GTK_TREE_VIEW(m_treeview), start.ByRef(), NULL ) ) { - return wxDataViewItem(); + return GTKPathToItem(start); } +#endif - return GTKPathToItem(start); + return wxDataViewItem(); } int wxDataViewCtrl::GetCountPerPage() const