From 78be7a0a343c040abb44a3fcd4c40fe95d6c1fe2 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 9 Oct 2008 15:57:55 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20555578=20=E2=80=93=20GtkTable=20propertiy?= =?UTF-8?q?=20maxima=20are=20wrong?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gtk/gtktable.c (gtk_table_class_init), (gtk_table_resize): Always use 65535 instead of G_MAXUINT since that is the actually supported maximum number of columns and rows svn path=/trunk/; revision=21619 --- ChangeLog | 8 ++++++++ gtk/gtktable.c | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6cb3ce635..5402b6f1ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-09 Christian Dywan + + Bug 555578 – GtkTable propertiy maxima are wrong + + * gtk/gtktable.c (gtk_table_class_init), (gtk_table_resize): + Always use 65535 instead of G_MAXUINT since that is + the actually supported maximum number of columns and rows + 2008-10-09 Richard Hult Bug 550342 – Splash screens have a caption diff --git a/gtk/gtktable.c b/gtk/gtktable.c index cd1e05578d..a5d4b95f64 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -129,7 +129,7 @@ gtk_table_class_init (GtkTableClass *class) P_("Rows"), P_("The number of rows in the table"), 1, - G_MAXUINT, + 65535, 1, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -138,7 +138,7 @@ gtk_table_class_init (GtkTableClass *class) P_("Columns"), P_("The number of columns in the table"), 1, - G_MAXUINT, + 65535, 1, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -147,7 +147,7 @@ gtk_table_class_init (GtkTableClass *class) P_("Row spacing"), P_("The amount of space between two consecutive rows"), 0, - G_MAXUINT, + 65535, 0, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -156,7 +156,7 @@ gtk_table_class_init (GtkTableClass *class) P_("Column spacing"), P_("The amount of space between two consecutive columns"), 0, - G_MAXUINT, + 65535, 0, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -482,8 +482,8 @@ gtk_table_resize (GtkTable *table, guint n_cols) { g_return_if_fail (GTK_IS_TABLE (table)); - g_return_if_fail (n_rows > 0 && n_rows < 65536); - g_return_if_fail (n_cols > 0 && n_cols < 65536); + g_return_if_fail (n_rows > 0 && n_rows <= 65535); + g_return_if_fail (n_cols > 0 && n_cols <= 65535); n_rows = MAX (n_rows, 1); n_cols = MAX (n_cols, 1);