From 0c6a6baa088d77886e23033a61a83b6c2b3a5767 Mon Sep 17 00:00:00 2001 From: MET Eckehard Berns Date: Sun, 18 Jan 1998 23:49:56 +0000 Subject: [PATCH] changed gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget as Mon Jan 19 00:46:18 1998 MET Eckehard Berns * gtk/gtktoolbar.[ch]: changed gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget as icon to allow more flexibility --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktoolbar.c | 6 +++--- gtk/gtktoolbar.h | 6 +++--- 9 files changed, 48 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e88364a95c..6f46320f1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e88364a95c..6f46320f1c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e88364a95c..6f46320f1c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e88364a95c..6f46320f1c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e88364a95c..6f46320f1c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e88364a95c..6f46320f1c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e88364a95c..6f46320f1c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jan 19 00:46:18 1998 MET Eckehard Berns + + * gtk/gtktoolbar.[ch]: changed + gtk_toolbar_{append,prepend,inser]_item to accept any GtkWidget + as icon to allow more flexibility + Sun Jan 18 16:54:55 CST 1998 Shawn T. Amundson * gtk/gtkstatusbar.[ch] added new widget, the statusbar diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 59c88633cb..c2a4c6e6e9 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -573,7 +573,7 @@ GtkWidget * gtk_toolbar_append_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, - GtkPixmap *icon, + GtkWidget *icon, GtkSignalFunc callback, gpointer user_data) { @@ -585,7 +585,7 @@ GtkWidget * gtk_toolbar_prepend_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, - GtkPixmap *icon, + GtkWidget *icon, GtkSignalFunc callback, gpointer user_data) { @@ -597,7 +597,7 @@ GtkWidget * gtk_toolbar_insert_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, - GtkPixmap *icon, + GtkWidget *icon, GtkSignalFunc callback, gpointer user_data, gint position) diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index daddf0fc6c..c54ac1f942 100644 --- a/gtk/gtktoolbar.h +++ b/gtk/gtktoolbar.h @@ -76,19 +76,19 @@ GtkWidget *gtk_toolbar_new (GtkOrientation orientation, GtkWidget *gtk_toolbar_append_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, - GtkPixmap *icon, + GtkWidget *icon, GtkSignalFunc callback, gpointer user_data); GtkWidget *gtk_toolbar_prepend_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, - GtkPixmap *icon, + GtkWidget *icon, GtkSignalFunc callback, gpointer user_data); GtkWidget *gtk_toolbar_insert_item (GtkToolbar *toolbar, const char *text, const char *tooltip_text, - GtkPixmap *icon, + GtkWidget *icon, GtkSignalFunc callback, gpointer user_data, gint position);