From ff4e78c0d8ceef618586cdce801af3f08d1dfc75 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 17 Mar 2002 00:07:17 +0000 Subject: [PATCH] use do_validate_rows instead of validate_rows_handler (fix by Mike Pieper, Sun Mar 17 01:11:16 2002 Kristian Rietveld * gtk/gtktreeview.c (gtk_tree_view_size_request): use do_validate_rows instead of validate_rows_handler (fix by Mike Pieper, #74126) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreeview.c | 3 ++- 7 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 16a8effcce..0a2003cad2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 17 01:11:16 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_request): use + do_validate_rows instead of validate_rows_handler (fix by + Mike Pieper, #74126) + Sat Mar 16 23:54:56 2002 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 16a8effcce..0a2003cad2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Mar 17 01:11:16 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_request): use + do_validate_rows instead of validate_rows_handler (fix by + Mike Pieper, #74126) + Sat Mar 16 23:54:56 2002 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 16a8effcce..0a2003cad2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sun Mar 17 01:11:16 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_request): use + do_validate_rows instead of validate_rows_handler (fix by + Mike Pieper, #74126) + Sat Mar 16 23:54:56 2002 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 16a8effcce..0a2003cad2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Mar 17 01:11:16 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_request): use + do_validate_rows instead of validate_rows_handler (fix by + Mike Pieper, #74126) + Sat Mar 16 23:54:56 2002 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 16a8effcce..0a2003cad2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Mar 17 01:11:16 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_request): use + do_validate_rows instead of validate_rows_handler (fix by + Mike Pieper, #74126) + Sat Mar 16 23:54:56 2002 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 16a8effcce..0a2003cad2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Mar 17 01:11:16 2002 Kristian Rietveld + + * gtk/gtktreeview.c (gtk_tree_view_size_request): use + do_validate_rows instead of validate_rows_handler (fix by + Mike Pieper, #74126) + Sat Mar 16 23:54:56 2002 Kristian Rietveld * gdk/x11/gdkwindow-x11.c (gdk_window_set_static_bit_gravity): just diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 87a80084c8..2e281eefa9 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -262,6 +262,7 @@ static gboolean validate_row (GtkTreeView *tree_view, GtkTreePath *path); static void validate_visible_area (GtkTreeView *tree_view); static gboolean validate_rows_handler (GtkTreeView *tree_view); +static gboolean do_validate_rows (GtkTreeView *tree_view); static gboolean presize_handler_callback (gpointer data); static void install_presize_handler (GtkTreeView *tree_view); static void install_scroll_sync_handler (GtkTreeView *tree_view); @@ -1490,7 +1491,7 @@ gtk_tree_view_size_request (GtkWidget *widget, /* we validate 50 rows initially just to make sure we have some size */ /* in practice, with a lot of static lists, this should get a good width */ - validate_rows_handler (tree_view); + do_validate_rows (tree_view); gtk_tree_view_size_request_columns (tree_view); gtk_tree_view_update_size (GTK_TREE_VIEW (widget));