diff options
| author | Federico Mena Quintero <federico@nuclecu.unam.mx> | 1998-01-13 06:14:52 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-01-13 06:14:52 +0000 |
| commit | 139026de73d4f7ef87a1ab210678bf3fe21e227c (patch) | |
| tree | 36eab1e0313f4b143ec3f46535e03e61def1bbef /tests | |
| parent | 284882b8c736e458ae8d6de509352caf4177b1df (diff) | |
| download | gtk+-139026de73d4f7ef87a1ab210678bf3fe21e227c.tar.gz | |
Fixed child->icon and child->label == NULL bugs.
1998-01-13 Federico Mena Quintero <federico@nuclecu.unam.mx>
* gtk/gtktoolbar.c: (gtk_real_toolbar_style_changed): Fixed
child->icon and child->label == NULL bugs.
* gtk/gtktoolbar.h: Added some new functions:
gtk_toolbar_append_widget()
gtk_toolbar_prepend_widget()
gtk_toolbar_insert_widget()
These let the user insert any kind of widget in the toolbar. Also
changed the gtk_toolbar_*_item() functions to return a
GtkWidget * so that the user can do things with the toolbar buttons.
* gtk/gtktoolbar.c: Now the toolbar supports its own buttons and
arbitrary widgets as well. Geometry management has been changed
accordingly. Added gtk_toolbar_remove() function, so container
functionality should be complete now.
* gtk/testgtk.c (create_toolbar): Added an entry widget to test
the new toolbar.
* Most of these changes are adapted from the
gtk-lupus-970112-0-patch (should be 970112... :-)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testgtk.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/testgtk.c b/tests/testgtk.c index a96735ce6a..e8471327ec 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -632,12 +632,13 @@ create_toolbar (void) { static GtkWidget *window = NULL; GtkWidget *toolbar; + GtkWidget *entry; if (!window) { window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Toolbar test"); - gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, TRUE); + gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, TRUE); gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (destroy_window), @@ -682,6 +683,12 @@ create_toolbar (void) gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); + entry = gtk_entry_new (); + gtk_widget_show(entry); + gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), NULL, entry); + + gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); + gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Small", "Use small spaces", GTK_PIXMAP (new_pixmap ("test.xpm", window->window, |