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

restore sorting functionality broken by r57161

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-07 16:16:21 +00:00
parent 0c5209a808
commit 140a119ad2
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/dataview.cpp
View File

@@ -2686,7 +2686,16 @@ void wxDataViewColumn::SetSortable( bool sortable )
{ {
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
gtk_tree_view_column_set_clickable( column, sortable ); if ( sortable )
{
gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
}
else
{
gtk_tree_view_column_set_sort_column_id( column, -1 );
gtk_tree_view_column_set_sort_indicator( column, FALSE );
gtk_tree_view_column_set_clickable( column, FALSE );
}
} }
bool wxDataViewColumn::IsSortable() const bool wxDataViewColumn::IsSortable() const
@@ -2695,25 +2704,18 @@ bool wxDataViewColumn::IsSortable() const
return gtk_tree_view_column_get_clickable( column ); return gtk_tree_view_column_get_clickable( column );
} }
void wxDataViewColumn::SetAsSortKey( bool sort ) void wxDataViewColumn::SetAsSortKey( bool WXUNUSED(sort) )
{ {
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); // it might not make sense to have this function in wxHeaderColumnBase at
// all in fact, changing of the sort order should only be done using the
if (sort) // associated control API
{ wxFAIL_MSG( "not implemented" );
gtk_tree_view_column_set_sort_column_id( column, GetModelColumn() );
}
else
{
gtk_tree_view_column_set_sort_column_id( column, -1 );
gtk_tree_view_column_set_sort_indicator( column, FALSE );
}
} }
bool wxDataViewColumn::IsSortKey() const bool wxDataViewColumn::IsSortKey() const
{ {
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column);
return (gtk_tree_view_column_get_sort_column_id( column ) != -1); return gtk_tree_view_column_get_sort_indicator( column );
} }
bool wxDataViewColumn::IsResizeable() const bool wxDataViewColumn::IsResizeable() const