forked from AuroraMiddleware/gtk
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.
This commit is contained in:
parent
79f69b1676
commit
73386d5761
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -1,3 +1,13 @@
|
||||
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.
|
||||
|
||||
Mon Jan 19 09:16:38 1998 Tim Janik <timj@psynet.net>
|
||||
|
||||
* gtk/gtkmain.c (gtk_grab_add) (gtk_grab_remove): this is a stack
|
||||
|
@ -167,6 +167,7 @@ static void
|
||||
gtk_toolbar_init (GtkToolbar *toolbar)
|
||||
{
|
||||
GTK_WIDGET_SET_FLAGS (toolbar, GTK_NO_WINDOW);
|
||||
GTK_WIDGET_UNSET_FLAGS (toolbar, GTK_CAN_FOCUS);
|
||||
|
||||
toolbar->num_children = 0;
|
||||
toolbar->children = NULL;
|
||||
@ -507,7 +508,7 @@ gtk_toolbar_add (GtkContainer *container,
|
||||
g_return_if_fail (GTK_IS_TOOLBAR (container));
|
||||
g_return_if_fail (widget != NULL);
|
||||
|
||||
gtk_toolbar_append_widget (GTK_TOOLBAR (container), NULL, widget);
|
||||
gtk_toolbar_append_widget (GTK_TOOLBAR (container), widget, NULL);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -725,24 +726,24 @@ gtk_toolbar_insert_space (GtkToolbar *toolbar,
|
||||
|
||||
void
|
||||
gtk_toolbar_append_widget (GtkToolbar *toolbar,
|
||||
const char *tooltip_text,
|
||||
GtkWidget *widget)
|
||||
GtkWidget *widget,
|
||||
const char *tooltip_text)
|
||||
{
|
||||
gtk_toolbar_insert_widget (toolbar, tooltip_text, widget, toolbar->num_children);
|
||||
gtk_toolbar_insert_widget (toolbar, widget, tooltip_text, toolbar->num_children);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_toolbar_prepend_widget (GtkToolbar *toolbar,
|
||||
const char *tooltip_text,
|
||||
GtkWidget *widget)
|
||||
GtkWidget *widget,
|
||||
const char *tooltip_text)
|
||||
{
|
||||
gtk_toolbar_insert_widget (toolbar, tooltip_text, widget, 0);
|
||||
gtk_toolbar_insert_widget (toolbar, widget, tooltip_text, 0);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_toolbar_insert_widget (GtkToolbar *toolbar,
|
||||
const char *tooltip_text,
|
||||
GtkWidget *widget,
|
||||
const char *tooltip_text,
|
||||
gint position)
|
||||
{
|
||||
Child *child;
|
||||
|
@ -97,14 +97,14 @@ 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,
|
||||
const char *tooltip_text);
|
||||
void gtk_toolbar_prepend_widget (GtkToolbar *toolbar,
|
||||
GtkWidget *widget,
|
||||
const char *tooltip_text);
|
||||
void gtk_toolbar_insert_widget (GtkToolbar *toolbar,
|
||||
GtkWidget *widget,
|
||||
const char *tooltip_text,
|
||||
gint position);
|
||||
|
||||
void gtk_toolbar_set_orientation (GtkToolbar *toolbar,
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user