diff options
| author | Tim Janik <timj@gtk.org> | 2001-11-21 23:49:17 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-11-21 23:49:17 +0000 |
| commit | 656ff6e8faaaaaf7de62f29908ddcb6eac1847ba (patch) | |
| tree | 5df298cd322dc1d42a2a468ca6bb12b6fc7209f0 /tests/testtreeview.c | |
| parent | aa1a46e26b1b22ac3fadf1a84b9f62410dee0710 (diff) | |
| download | gtk+-656ff6e8faaaaaf7de62f29908ddcb6eac1847ba.tar.gz | |
raise event window afte children, in order for the input pnly window to
Wed Nov 21 22:55:37 2001 Tim Janik <timj@gtk.org>
* gtk/gtkbutton.c (gtk_button_map): raise event window afte
children, in order for the input pnly window to stay *above*
children.
Wed Nov 21 22:44:27 2001 Tim Janik <timj@gtk.org>
* tests/testtreeview.c: make hackery worse ;) by checking fundamental
type walks againts G_TYPE_FUNDAMENTAL_MAX.
* tests/prop-editor.c: disable type hackery.
Diffstat (limited to 'tests/testtreeview.c')
| -rw-r--r-- | tests/testtreeview.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/tests/testtreeview.c b/tests/testtreeview.c index 5509537e46..10b5377e48 100644 --- a/tests/testtreeview.c +++ b/tests/testtreeview.c @@ -559,7 +559,7 @@ create_tree_model (void) t[6], t[7], t[8]); i = 0; - while (i < G_TYPE_RESERVED_LAST_FUNDAMENTAL) + while (i < G_TYPE_FUNDAMENTAL_MAX) { typesystem_recurse (i, NULL, store); @@ -987,13 +987,17 @@ gtk_real_model_types_iter_next (GtkTreeModel *tree_model, type = GPOINTER_TO_INT (iter->user_data); parent = g_type_parent (type); - + if (parent == G_TYPE_INVALID) { - /* fundamental type, add 1 */ - if ((type + 1) < G_TYPE_RESERVED_LAST_FUNDAMENTAL) - { - iter->user_data = GINT_TO_POINTER (type + 1); + /* find next _valid_ fundamental type */ + do + type++; + while (!g_type_name (type) && type <= G_TYPE_FUNDAMENTAL_MAX); + if (type <= G_TYPE_FUNDAMENTAL_MAX) + { + /* found one */ + iter->user_data = GINT_TO_POINTER (type); return TRUE; } else @@ -1079,7 +1083,7 @@ gtk_real_model_types_iter_n_children (GtkTreeModel *tree_model, { if (iter == NULL) { - return G_TYPE_RESERVED_LAST_FUNDAMENTAL - 1; + return G_TYPE_FUNDAMENTAL_MAX; } else { @@ -1106,7 +1110,7 @@ gtk_real_model_types_iter_nth_child (GtkTreeModel *tree_model, if (parent == NULL) { /* fundamental type */ - if (n < G_TYPE_RESERVED_LAST_FUNDAMENTAL) + if (n < G_TYPE_FUNDAMENTAL_MAX) { iter->user_data = GINT_TO_POINTER (n); return TRUE; @@ -1154,7 +1158,7 @@ gtk_real_model_types_iter_parent (GtkTreeModel *tree_model, if (parent == G_TYPE_INVALID) { - if (type >= G_TYPE_RESERVED_LAST_FUNDAMENTAL) + if (type > G_TYPE_FUNDAMENTAL_MAX) g_warning ("no parent for %d %s\n", type, g_type_name (type)); return FALSE; } |