Merged from stable.

Mon Jun 10 01:12:31 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
	check if width is !null, not *width. Doh.
This commit is contained in:
Kristian Rietveld 2003-06-09 23:12:46 +00:00 committed by Kristian Rietveld
parent bf2e5fc154
commit 801531ca88
6 changed files with 36 additions and 1 deletions

View File

@ -1,3 +1,10 @@
Mon Jun 10 01:12:31 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
check if width is !null, not *width. Doh.
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,10 @@
Mon Jun 10 01:12:31 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
check if width is !null, not *width. Doh.
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,10 @@
Mon Jun 10 01:12:31 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
check if width is !null, not *width. Doh.
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,10 @@
Mon Jun 10 01:12:31 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
check if width is !null, not *width. Doh.
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -1,3 +1,10 @@
Mon Jun 10 01:12:31 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
check if width is !null, not *width. Doh.
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.

View File

@ -2431,7 +2431,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
if (visible == FALSE)
continue;
if (first_cell == FALSE && *width)
if (first_cell == FALSE && width)
*width += tree_column->spacing;
gtk_cell_renderer_get_size (info->cell,