diff options
| author | Federico Mena <federico@bananoid.nuclecu.unam.mx> | 1998-01-19 22:38:22 +0000 |
|---|---|---|
| committer | Arturo Espinosa <unammx@src.gnome.org> | 1998-01-19 22:38:22 +0000 |
| commit | 73386d5761bff02580cc818f794cfdf52869f16b (patch) | |
| tree | 1c3c05ecca62805305cc7496b99fb6cf96cc0fbe /tests | |
| parent | 79f69b1676b3efb8a1b7706c9c8d4a43e47a269c (diff) | |
| download | gtk+-73386d5761bff02580cc818f794cfdf52869f16b.tar.gz | |
Removed the GTK_PIXMAP casts to match Eckehard's new prototypes.
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/testgtk.c (create_toolbar): Removed the GTK_PIXMAP casts to
match Eckehard's new prototypes.
* gtk/gtktoolbar.h: Switched the order of the tooltip_text and
widget parameters to the gtk_toolbar_*_widget() functions, to be
friendlier to the C++ bindings. This is per request of Guillaume
Laurent.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testgtk.c | 56 |
1 files changed, 19 insertions, 37 deletions
diff --git a/tests/testgtk.c b/tests/testgtk.c index 47c01b3094..ede3cde21b 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -654,63 +654,54 @@ create_toolbar (void) gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Horizontal", "Horizontal toolbar layout", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_horizontal, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Vertical", "Vertical toolbar layout", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_vertical, toolbar); gtk_toolbar_append_space (GTK_TOOLBAR(toolbar)); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Icons", "Only show toolbar icons", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_icons, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Text", "Only show toolbar text", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_text, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Both", "Show toolbar icons and text", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_both, toolbar); 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_widget (GTK_TOOLBAR (toolbar), entry, NULL); 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, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_small_space, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Big", "Use big spaces", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_big_space, toolbar); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Enable", "Enable tooltips", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_enable, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Disable", "Disable tooltips", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_disable, toolbar); gtk_container_add (GTK_CONTAINER (window), toolbar); @@ -735,57 +726,48 @@ make_toolbar (GtkWidget *window) gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Horizontal", "Horizontal toolbar layout", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_horizontal, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Vertical", "Vertical toolbar layout", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_vertical, toolbar); gtk_toolbar_append_space (GTK_TOOLBAR(toolbar)); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Icons", "Only show toolbar icons", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_icons, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Text", "Only show toolbar text", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_text, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Both", "Show toolbar icons and text", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_both, toolbar); 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, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_small_space, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Big", "Use big spaces", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_big_space, toolbar); gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Enable", "Enable tooltips", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_enable, toolbar); gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), "Disable", "Disable tooltips", - GTK_PIXMAP (new_pixmap ("test.xpm", window->window, - &window->style->bg[GTK_STATE_NORMAL])), + new_pixmap ("test.xpm", window->window, &window->style->bg[GTK_STATE_NORMAL]), (GtkSignalFunc) set_toolbar_disable, toolbar); return toolbar; |