diff options
| author | Soeren Sandmann <sandmann@daimi.au.dk> | 2003-07-02 14:04:43 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2003-07-02 14:04:43 +0000 |
| commit | 2669847342d37bdbbe9107128579de090e1a121a (patch) | |
| tree | eab2a139c140c572b30d459c0215319c44c13c3a /gtk/gtktoolbutton.h | |
| parent | 39f5280dcbdd7611f9a57a1e7a472afe6b23b634 (diff) | |
| download | gtk+-2669847342d37bdbbe9107128579de090e1a121a.tar.gz | |
Add new toolbar headers
Wed Jul 2 15:42:26 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtk.h: Add new toolbar headers
* tests/testtoolbar.c: new file
* tests/Makefile.am (noinst_PROGRAMS): Add testtoolbar.c
* gtk/gtkexpander.c (gtk_expander_class_init): Make it compile
Tue Jul 1 22:49:25 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c:
(gtk_toolbar_remove_tool_item): Fix bug where list is changed
inside a for loop (pointed out by Morten Welinder).
(gtk_toolbar_focus_home_or_end): Minor formatting change
Comments from Owen:
* gtk/gtktoolbutton.c: remove copy of elide_underscores(). Use
gtk_toolbar_elide_underscores instead.
* gtk/gtktoolbar.c: rename signal from focus_ends to
focus_home_or_end.
(_gtk_toolbar_elide_underscores): export this as an internal
function.
(gtk_toolbar_move_focus): add comment explaining difference to
gtk_toolbar_focus();
(gtk_toolbar_list_children_in_focus_order): Make TAB_FORWARD and
TAB_BACKWARD focus the right widgets in RTL mode
* gtk/gtktoolbutton.c (gtk_tool_button_new): Change to take
"label" and "icon" parameters
* gtk/gtktoolbutton.[ch]: remove icon_set property.
Diffstat (limited to 'gtk/gtktoolbutton.h')
| -rw-r--r-- | gtk/gtktoolbutton.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h index 72456e894e..e2c6efbfe7 100644 --- a/gtk/gtktoolbutton.h +++ b/gtk/gtktoolbutton.h @@ -48,7 +48,6 @@ struct _GtkToolButton gchar *label_text; GtkWidget *label_widget; GtkWidget *icon_widget; - GtkIconSet *icon_set; guint use_underline : 1; }; @@ -64,7 +63,8 @@ struct _GtkToolButtonClass }; GType gtk_tool_button_get_type (void); -GtkToolItem *gtk_tool_button_new (void); +GtkToolItem *gtk_tool_button_new (const gchar *label, + GtkWidget *icon_widget); GtkToolItem *gtk_tool_button_new_from_stock (const gchar *stock_id); void gtk_tool_button_set_label (GtkToolButton *button, @@ -76,9 +76,6 @@ gboolean gtk_tool_button_get_use_underline (GtkToolButton *button); void gtk_tool_button_set_stock_id (GtkToolButton *button, const gchar *stock_id); G_CONST_RETURN gchar *gtk_tool_button_get_stock_id (GtkToolButton *button); -void gtk_tool_button_set_icon_set (GtkToolButton *button, - GtkIconSet *icon_set); -GtkIconSet * gtk_tool_button_get_icon_set (GtkToolButton *button); void gtk_tool_button_set_icon_widget (GtkToolButton *button, GtkWidget *icon); GtkWidget * gtk_tool_button_get_icon_widget (GtkToolButton *button); |