diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | docs/reference/ChangeLog | 4 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtktable.sgml | 5 | ||||
| -rw-r--r-- | gtk/gtkliststore.c | 13 | ||||
| -rw-r--r-- | gtk/gtktable.c | 5 |
11 files changed, 74 insertions, 9 deletions
@@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9a40e2608..b1581cf34 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a40e2608..b1581cf34 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9a40e2608..b1581cf34 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9a40e2608..b1581cf34 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9a40e2608..b1581cf34 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9a40e2608..b1581cf34 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Jun 8 12:38:49 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/gtktable.c (gtk_table_resize): warn if row/cols are out of + range. Fix bug #55921 + + * gtk/gtkliststore.c (gtk_list_store_new_with_types): fix doc bug + (#55920). + Fri Jun 8 12:03:07 2001 Owen Taylor <otaylor@redhat.com> * gdk/gdkkeys.[ch]: Add a direction-changed signal, diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index e4afc0565..2bc011643 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +Fri Jun 8 12:33:29 2001 Jonathan Blandford <jrb@redhat.com> + + * gtk/tmpl/gtktable.sgml: fix bug #55921 + 2001-06-05 Havoc Pennington <hp@redhat.com> * gtk/tmpl/gtkscale.sgml: more docs diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index 3ca973b37..59242d40b 100644 --- a/docs/reference/gtk/tmpl/gtktable.sgml +++ b/docs/reference/gtk/tmpl/gtktable.sgml @@ -100,7 +100,10 @@ These fields should be considered read-only and not be modified directly. <!-- ##### FUNCTION gtk_table_new ##### --> <para> -Used to create a new table widget. An initial size must be given by specifying how many rows and columns the table should have, although this can be changed later with gtk_table_resize(). +Used to create a new table widget. An initial size must be given by +specifying how many rows and columns the table should have, although +this can be changed later with gtk_table_resize(). @rows and @columns +must both be in the range 0 .. 65535. </para> @rows: The number of rows the new table should have. diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 92490eccf..5ef888885 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -254,13 +254,14 @@ gtk_list_store_new (void) /** * gtk_list_store_new_with_types: * @n_columns: number of columns in the list store - * @Varargs: pairs of column number and #GType - * - * Creates a new list store as with gtk_list_store_new(), - * simultaneously setting up the columns and column types as with - * gtk_list_store_set_n_columns() and - * gtk_list_store_set_column_type(). + * @Varargs: all #GType types for the columns, from first to last * + * Creates a new list store as with gtk_list_store_new(), simultaneously setting + * up the columns and column types as with gtk_list_store_set_n_columns() and + * gtk_list_store_set_column_type(). As an example, + * gtk_tree_store_new_with_types (3, G_TYPE_INT, G_TYPE_STRING, + * GTK_TYPE_PIXBUF); will create a new GtkListStore with three columns, of type + * int, string and GtkPixbuf respectively. * * Return value: a new #GtkListStore **/ diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 037e3e219..98e7709fe 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -469,12 +469,13 @@ gtk_table_resize (GtkTable *table, guint n_rows, guint n_cols) { - g_return_if_fail (table != NULL); g_return_if_fail (GTK_IS_TABLE (table)); + g_return_if_fail (n_rows > 0 && n_rows < 65536); + g_return_if_fail (n_rows > 0 && n_cols < 65536); n_rows = MAX (n_rows, 1); n_cols = MAX (n_cols, 1); - + if (n_rows != table->nrows || n_cols != table->ncols) { |