AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

only check sort column id if connected to sortable model.

Browse Source 
2006-05-30  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only
	check sort column id if connected to sortable model.
This commit is contained in:
Kristian Rietveld 2006-05-30 09:29:49 +00:00 committed by Kristian Rietveld
parent 416b66f3ab
commit c4176c97e3
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-05-30 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only
check sort column id if connected to sortable model.
2006-05-30 Behdad Esfahbod <behdad@gnome.org>
* gdk/gdkpango.c (draw_error_underline): Fix offset to center the

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2006-05-30 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button): only
check sort column id if connected to sortable model.
2006-05-30 Behdad Esfahbod <behdad@gnome.org>
* gdk/gdkpango.c (draw_error_underline): Fix offset to center the

15
gtk/gtktreeviewcolumn.c
View File

@ -848,6 +848,12 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
GtkWidget *arrow;
GtkWidget *current_child;
GtkArrowType arrow_type = GTK_ARROW_NONE;
GtkTreeModel *model;
if (tree_column->tree_view)
model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view));
else
model = NULL;
/* Create a button if necessary */
if (tree_column->visible &&
@ -898,9 +904,10 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
"");
}
if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (GTK_TREE_VIEW (tree_column->tree_view)->priv->model),
&sort_column_id,
NULL))
if (GTK_IS_TREE_SORTABLE (model)
&& gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
&sort_column_id,
NULL))
{
if (sort_column_id == tree_column->sort_column_id)
{
@ -944,7 +951,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
}
g_object_unref (arrow);
if (tree_column->sort_column_id >= 0)
if (GTK_IS_TREE_SORTABLE (model) && tree_column->sort_column_id >= 0)
gtk_widget_show (arrow);
else
gtk_widget_hide (arrow);