DeforaOS/libDesktop
DeforaOS/libDesktop
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowed libDesktop toolbars to pack items without a stock icon or icon name

Browse Source
This commit is contained in:
Pierre Pronchery 2009-11-24 22:56:50 +00:00
parent f9aa0bdff2
commit 88c7b51ad7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Desktop/toolbar.h
View File

@ -25,6 +25,7 @@ typedef struct _DesktopToolbar
{
const char * name;
GtkSignalFunc callback;
const char * stock;
unsigned int accel;
GtkToolItem * widget;
} DesktopToolbar;

9
src/toolbar.c
View File

@ -38,15 +38,16 @@ GtkWidget * desktop_toolbar_create(DesktopToolbar * toolbar, gpointer data,
gtk_toolbar_insert(GTK_TOOLBAR(ret), p->widget, -1);
continue;
}
else if(strncmp(p->name, "gtk-", 4) != 0) /* not a stock icon */
else if(strncmp(p->stock, "gtk-", 4) == 0) /* stock icon */
p->widget = gtk_tool_button_new_from_stock(p->stock);
else if(p->stock != NULL) /* icon name */
{
/* XXX have stock and name instead (needs API change) */
widget = gtk_image_new_from_icon_name(p->name,
widget = gtk_image_new_from_icon_name(p->stock,
GTK_ICON_SIZE_LARGE_TOOLBAR);
p->widget = gtk_tool_button_new(widget, NULL);
}
else
p->widget = gtk_tool_button_new_from_stock(p->name);
p->widget = gtk_tool_button_new(NULL, p->name);
g_signal_connect_swapped(G_OBJECT(p->widget), "clicked",
G_CALLBACK(p->callback), data);
if(accel != NULL && p->accel != 0)