From e77c48331b08159687c3fc0e6ce84033bb2a4af7 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 25 Aug 2015 22:38:26 -0700 Subject: [PATCH] Update internal sorting state in wxDataViewColumn::SetSortOrder() This allows a subsequent wxDataViewModel::Resort() to actually work, see #15626 --- src/gtk/dataview.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index 7233f6fe83..ec359bbe2c 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -3178,12 +3178,17 @@ void wxDataViewColumn::SetSortOrder( bool ascending ) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); + GtkSortType order = GTK_SORT_DESCENDING; if (ascending) - gtk_tree_view_column_set_sort_order( column, GTK_SORT_ASCENDING ); - else - gtk_tree_view_column_set_sort_order( column, GTK_SORT_DESCENDING ); + order = GTK_SORT_ASCENDING; + gtk_tree_view_column_set_sort_order(column, order); gtk_tree_view_column_set_sort_indicator( column, TRUE ); + + wxDataViewCtrlInternal* internal = m_owner->GtkGetInternal(); + internal->SetSortOrder(order); + internal->SetSortColumn(m_model_column); + internal->SetDataViewSortColumn(this); } bool wxDataViewColumn::IsSortOrderAscending() const