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 /gtk/gtktoolbar.h | |
| 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 'gtk/gtktoolbar.h')
| -rw-r--r-- | gtk/gtktoolbar.h | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 189aeef69a..daddf0fc6c 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -54,8 +54,8 @@ struct _GtkToolbar GtkTooltips *tooltips; - gint child_maxw; - gint child_maxh; + gint button_maxw; + gint button_maxh; }; struct _GtkToolbarClass @@ -73,19 +73,19 @@ guint gtk_toolbar_get_type (void); GtkWidget *gtk_toolbar_new (GtkOrientation orientation, GtkToolbarStyle style); -void gtk_toolbar_append_item (GtkToolbar *toolbar, +GtkWidget *gtk_toolbar_append_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, GtkPixmap *icon, GtkSignalFunc callback, gpointer user_data); -void gtk_toolbar_prepend_item (GtkToolbar *toolbar, +GtkWidget *gtk_toolbar_prepend_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, GtkPixmap *icon, GtkSignalFunc callback, gpointer user_data); -void gtk_toolbar_insert_item (GtkToolbar *toolbar, +GtkWidget *gtk_toolbar_insert_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, GtkPixmap *icon, @@ -96,6 +96,16 @@ void gtk_toolbar_append_space (GtkToolbar *toolbar); void gtk_toolbar_prepend_space (GtkToolbar *toolbar); void gtk_toolbar_insert_space (GtkToolbar *toolbar, gint position); +void gtk_toolbar_append_widget (GtkToolbar *toolbar, + const char *tooltip_text, + GtkWidget *widget); +void gtk_toolbar_prepend_widget (GtkToolbar *toolbar, + const char *tooltip_text, + GtkWidget *widget); +void gtk_toolbar_insert_widget (GtkToolbar *toolbar, + const char *tooltip_text, + GtkWidget *widget, + gint position); void gtk_toolbar_set_orientation (GtkToolbar *toolbar, GtkOrientation orientation); |