summaryrefslogtreecommitdiffstats
path: root/src/shortcuts.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:10:02 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-11-03 00:10:02 +0000
commitd2df0412f728dd5bb54537dfdfe7c35b34d40e0e (patch)
treee2703384779e83312c456399999997fcc289c5cf /src/shortcuts.cpp
parentMerge branch 'master' into powerpencil (diff)
parentchange assignment to equality (diff)
downloadinkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.tar.gz
inkscape-d2df0412f728dd5bb54537dfdfe7c35b34d40e0e.zip
Merge branch 'master' into powerpencil
Diffstat (limited to 'src/shortcuts.cpp')
-rw-r--r--src/shortcuts.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index c1677ca51..0a1e0c4a9 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -153,7 +153,7 @@ guint sp_shortcut_translate_event(GdkEventKey const *event, guint *effective_mod
guint remaining_modifiers = 0;
guint resulting_modifiers = 0; // remaining modifiers encoded in high-bit mask
- keyval = Inkscape::UI::Tools::get_group0_keyval(event, &consumed_modifiers);
+ keyval = Inkscape::UI::Tools::get_latin_keyval(event, &consumed_modifiers);
remaining_modifiers = initial_modifiers & ~consumed_modifiers;
resulting_modifiers = ( remaining_modifiers & GDK_SHIFT_MASK ? SP_SHORTCUT_SHIFT_MASK : 0 ) |
@@ -485,7 +485,7 @@ void sp_shortcut_file_export_do(char const *exportname) {
* Shortcut file consists of pairs of bind elements :
* Element (a) is used for shortcut display in menus (display="True") and contains the gdk_keyval_name of the shortcut key
* Element (b) is used in shortcut lookup and contains an uppercase version of the gdk_keyval_name,
- * or a gdk_keyval_name name and the "Shift" modifier for Shift altered hardware code keys (see get_group0_keyval() for explanation)
+ * or a gdk_keyval_name name and the "Shift" modifier for Shift altered hardware code keys (see get_latin_keyval() for explanation)
*/
void sp_shortcut_delete_from_file(char const * /*action*/, unsigned int const shortcut) {