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

Updated the API for menubar and toolbar accelerators (must specify the modifier)

Browse Source
This commit is contained in:
Pierre Pronchery 2010-05-04 00:07:01 +00:00
parent 828cc08a4b
commit bfb8968156
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Desktop/menubar.h
View File

@ -26,6 +26,7 @@ typedef struct _DesktopMenu
const char * name; const char * name;
GtkSignalFunc callback; GtkSignalFunc callback;
const char * stock; const char * stock;
GdkModifierType modifier;
unsigned int accel; unsigned int accel;
} DesktopMenu; } DesktopMenu;

1
include/Desktop/toolbar.h
View File

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

2
src/menubar.c
View File

@ -74,7 +74,7 @@ static GtkWidget * _menubar_create_menu(DesktopMenu * menu, gpointer data,
gtk_widget_set_sensitive(menuitem, FALSE); gtk_widget_set_sensitive(menuitem, FALSE);
if(accel != NULL && p->accel != 0) if(accel != NULL && p->accel != 0)
gtk_widget_add_accelerator(menuitem, "activate", accel, gtk_widget_add_accelerator(menuitem, "activate", accel,
p->accel, GDK_CONTROL_MASK, p->accel, p->modifier,
GTK_ACCEL_VISIBLE); GTK_ACCEL_VISIBLE);
gtk_menu_shell_append(GTK_MENU_SHELL(ret), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(ret), menuitem);
} }

4
src/toolbar.c
View File

@ -55,8 +55,8 @@ GtkWidget * desktop_toolbar_create(DesktopToolbar * toolbar, gpointer data,
G_CALLBACK(p->callback), data); G_CALLBACK(p->callback), data);
if(accel != NULL && p->accel != 0) if(accel != NULL && p->accel != 0)
gtk_widget_add_accelerator(GTK_WIDGET(p->widget), gtk_widget_add_accelerator(GTK_WIDGET(p->widget),
"clicked", accel, p->accel, "clicked", accel, p->accel, p->modifier,
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); GTK_ACCEL_VISIBLE);
gtk_toolbar_insert(GTK_TOOLBAR(ret), p->widget, -1); gtk_toolbar_insert(GTK_TOOLBAR(ret), p->widget, -1);
} }
return ret; return ret;