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

Revert "treeview: Remove unneeded checks"

Browse Source 
This reverts commit a158a2aa48.

The commit conflicts with a later revert, so move it out of the way.
This commit is contained in:
Matthias Clasen 2014-06-01 10:09:52 -04:00
parent 97930a774b
commit 210453b79e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktreeview.c
View File

@ -2591,8 +2591,10 @@ gtk_tree_view_get_preferred_width (GtkWidget *widget,
tree_view->priv->n_expand_columns++; tree_view->priv->n_expand_columns++;
} }
*minimum = tree_view->priv->minimum_width; if (minimum != NULL)
*natural = tree_view->priv->natural_width; *minimum = tree_view->priv->minimum_width;
if (natural != NULL)
*natural = tree_view->priv->natural_width;
} }
static void static void
@ -2607,8 +2609,10 @@ gtk_tree_view_get_preferred_height (GtkWidget *widget,
height = gtk_tree_view_get_height (tree_view) + gtk_tree_view_get_effective_header_height (tree_view); height = gtk_tree_view_get_height (tree_view) + gtk_tree_view_get_effective_header_height (tree_view);
*minimum = height; if (minimum != NULL)
*natural = height; *minimum = height;
if (natural != NULL)
*natural = height;
} }
static void static void