Updated the API for menubar and toolbar accelerators (must specify the modifier)
This commit is contained in:
parent
828cc08a4b
commit
bfb8968156
|
@ -26,6 +26,7 @@ typedef struct _DesktopMenu
|
|||
const char * name;
|
||||
GtkSignalFunc callback;
|
||||
const char * stock;
|
||||
GdkModifierType modifier;
|
||||
unsigned int accel;
|
||||
} DesktopMenu;
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@ typedef struct _DesktopToolbar
|
|||
const char * name;
|
||||
GtkSignalFunc callback;
|
||||
const char * stock;
|
||||
GdkModifierType modifier;
|
||||
unsigned int accel;
|
||||
GtkToolItem * widget;
|
||||
} DesktopToolbar;
|
||||
|
|
|
@ -74,7 +74,7 @@ static GtkWidget * _menubar_create_menu(DesktopMenu * menu, gpointer data,
|
|||
gtk_widget_set_sensitive(menuitem, FALSE);
|
||||
if(accel != NULL && p->accel != 0)
|
||||
gtk_widget_add_accelerator(menuitem, "activate", accel,
|
||||
p->accel, GDK_CONTROL_MASK,
|
||||
p->accel, p->modifier,
|
||||
GTK_ACCEL_VISIBLE);
|
||||
gtk_menu_shell_append(GTK_MENU_SHELL(ret), menuitem);
|
||||
}
|
||||
|
|
|
@ -55,8 +55,8 @@ GtkWidget * desktop_toolbar_create(DesktopToolbar * toolbar, gpointer data,
|
|||
G_CALLBACK(p->callback), data);
|
||||
if(accel != NULL && p->accel != 0)
|
||||
gtk_widget_add_accelerator(GTK_WIDGET(p->widget),
|
||||
"clicked", accel, p->accel,
|
||||
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
|
||||
"clicked", accel, p->accel, p->modifier,
|
||||
GTK_ACCEL_VISIBLE);
|
||||
gtk_toolbar_insert(GTK_TOOLBAR(ret), p->widget, -1);
|
||||
}
|
||||
return ret;
|
||||
|
|
Loading…
Reference in New Issue
Block a user