AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

accel: Add display arg to gtk_accelerator_parse_with_keycode()

Browse Source 
It was using the default display unconditionally.
This commit is contained in:
Benjamin Otte 2018-08-21 00:44:47 +02:00 committed by Matthias Clasen
parent 580863b112
commit 90a34312d4
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkaccelgroup.c
View File

@ -912,6 +912,7 @@ is_keycode (const gchar *string)
/** /**
* gtk_accelerator_parse_with_keycode: * gtk_accelerator_parse_with_keycode:
* @accelerator: string representing an accelerator * @accelerator: string representing an accelerator
* @display: (allow-none): the #GdkDisplay to look up @accelerator_codes in
* @accelerator_key: (out) (allow-none): return location for accelerator * @accelerator_key: (out) (allow-none): return location for accelerator
* keyval, or %NULL * keyval, or %NULL
* @accelerator_codes: (out) (array zero-terminated=1) (transfer full) (allow-none): * @accelerator_codes: (out) (array zero-terminated=1) (transfer full) (allow-none):
@ -937,6 +938,7 @@ is_keycode (const gchar *string)
*/ */
gboolean gboolean
gtk_accelerator_parse_with_keycode (const gchar *accelerator, gtk_accelerator_parse_with_keycode (const gchar *accelerator,
GdkDisplay *display,
guint *accelerator_key, guint *accelerator_key,
guint **accelerator_codes, guint **accelerator_codes,
GdkModifierType *accelerator_mods) GdkModifierType *accelerator_mods)
@ -1100,7 +1102,7 @@ gtk_accelerator_parse_with_keycode (const gchar *accelerator,
if (keyval && accelerator_codes != NULL) if (keyval && accelerator_codes != NULL)
{ {
GdkKeymap *keymap = gdk_display_get_keymap (gdk_display_get_default ()); GdkKeymap *keymap = gdk_display_get_keymap (display ? display : gdk_display_get_default ());
GdkKeymapKey *keys; GdkKeymapKey *keys;
gint n_keys, i, j; gint n_keys, i, j;
@ -1193,7 +1195,7 @@ gtk_accelerator_parse (const gchar *accelerator,
guint *accelerator_key, guint *accelerator_key,
GdkModifierType *accelerator_mods) GdkModifierType *accelerator_mods)
{ {
return gtk_accelerator_parse_with_keycode (accelerator, accelerator_key, NULL, accelerator_mods); return gtk_accelerator_parse_with_keycode (accelerator, NULL, accelerator_key, NULL, accelerator_mods);
} }
/** /**

1
gtk/gtkaccelgroup.h
View File

@ -189,6 +189,7 @@ gboolean gtk_accelerator_parse (const gchar *accelerator,
GdkModifierType *accelerator_mods); GdkModifierType *accelerator_mods);
GDK_AVAILABLE_IN_ALL GDK_AVAILABLE_IN_ALL
gboolean gtk_accelerator_parse_with_keycode (const gchar *accelerator, gboolean gtk_accelerator_parse_with_keycode (const gchar *accelerator,
GdkDisplay *display,
guint *accelerator_key, guint *accelerator_key,
guint **accelerator_codes, guint **accelerator_codes,
GdkModifierType *accelerator_mods); GdkModifierType *accelerator_mods);

1
testsuite/gtk/accel.c
View File

@ -29,6 +29,7 @@ test_one_accel (const char *accel,
accel_key = 0; accel_key = 0;
g_assert (gtk_accelerator_parse_with_keycode (accel, g_assert (gtk_accelerator_parse_with_keycode (accel,
gdk_display_get_default (),
&accel_key, &accel_key,
&keycodes, &keycodes,
&mods)); &mods));