diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-02-17 22:59:46 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-02-17 23:01:27 +0100 |
| commit | 130f8fa1936f672ec34fd0270e1d2c0577f95eed (patch) | |
| tree | c7b64d06c6a2d0bc76d8c74bfe56efdeeb7ebbff /platform | |
| parent | f0971ccf5f4a2d693a4e0debca5a1902a2498e76 (diff) | |
Rename KEY_KP_SUBSTRACT to KEY_KP_SUBTRACT
The former name was incorrect in English, though for us latin lovers it's an understandable mistake.
Second part of and closes #3626.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/haiku/key_mapping_haiku.cpp | 2 | ||||
| -rw-r--r-- | platform/nacl/nacl_keycodes.h | 2 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 2 | ||||
| -rw-r--r-- | platform/windows/key_mapping_win.cpp | 2 | ||||
| -rw-r--r-- | platform/x11/key_mapping_x11.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/platform/haiku/key_mapping_haiku.cpp b/platform/haiku/key_mapping_haiku.cpp index d7bde9a727..1c0584523a 100644 --- a/platform/haiku/key_mapping_haiku.cpp +++ b/platform/haiku/key_mapping_haiku.cpp @@ -160,7 +160,7 @@ unsigned int KeyMappingHaiku::get_keysym(int32 raw_char, int32 key) { if (raw_char == B_UP_ARROW && key == 0x38) { return KEY_KP_8; } if (raw_char == B_PAGE_UP && key == 0x39) { return KEY_KP_9; } if (raw_char == 0x2F && key == 0x23) { return KEY_KP_DIVIDE; } - if (raw_char == 0x2D && key == 0x25) { return KEY_KP_SUBSTRACT; } + if (raw_char == 0x2D && key == 0x25) { return KEY_KP_SUBTRACT; } if (raw_char == B_DELETE && key == 0x65) { return KEY_KP_PERIOD; } if (raw_char == 0x10) { diff --git a/platform/nacl/nacl_keycodes.h b/platform/nacl/nacl_keycodes.h index 45dba075db..a0642fc3b7 100644 --- a/platform/nacl/nacl_keycodes.h +++ b/platform/nacl/nacl_keycodes.h @@ -286,7 +286,7 @@ static uint32_t godot_key(uint32_t p_key, bool& is_char) { case VKEY_MULTIPLY: return KEY_KP_MULTIPLY; case VKEY_ADD: return KEY_KP_ADD; // case VKEY_SEPARATOR: return KEY_SEPARATOR; - case VKEY_SUBTRACT: return KEY_KP_SUBSTRACT; + case VKEY_SUBTRACT: return KEY_KP_SUBTRACT; case VKEY_DECIMAL: return KEY_KP_PERIOD; case VKEY_DIVIDE: return KEY_KP_DIVIDE; case VKEY_F1: return KEY_F1; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index d808fb67a2..bb99e6ade7 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -650,7 +650,7 @@ static int translateKey(unsigned int key) /* 4b */ KEY_KP_DIVIDE, /* 4c */ KEY_KP_ENTER, /* 4d */ KEY_UNKNOWN, - /* 4e */ KEY_KP_SUBSTRACT, + /* 4e */ KEY_KP_SUBTRACT, /* 4f */ KEY_UNKNOWN, /* 50 */ KEY_UNKNOWN, /* 51 */ KEY_EQUAL, //wtf equal? diff --git a/platform/windows/key_mapping_win.cpp b/platform/windows/key_mapping_win.cpp index 07d5f32253..23fa29d68f 100644 --- a/platform/windows/key_mapping_win.cpp +++ b/platform/windows/key_mapping_win.cpp @@ -145,7 +145,7 @@ static _WinTranslatePair _vk_to_keycode[]={ { KEY_KP_MULTIPLY,VK_MULTIPLY},// (0x6A) { KEY_KP_ADD,VK_ADD},// (0x6B) //VK_SEPARATOR (0x6C) -{ KEY_KP_SUBSTRACT,VK_SUBTRACT},// (0x6D) +{ KEY_KP_SUBTRACT,VK_SUBTRACT},// (0x6D) { KEY_KP_PERIOD,VK_DECIMAL},// (0x6E) { KEY_KP_DIVIDE,VK_DIVIDE},// (0x6F) { KEY_F1,VK_F1},// (0x70) diff --git a/platform/x11/key_mapping_x11.cpp b/platform/x11/key_mapping_x11.cpp index 48f415a730..46f1483767 100644 --- a/platform/x11/key_mapping_x11.cpp +++ b/platform/x11/key_mapping_x11.cpp @@ -97,7 +97,7 @@ static _XTranslatePair _xkeysym_to_keycode[]={ { XK_KP_Enter, KEY_KP_ENTER }, { XK_KP_Multiply, KEY_KP_MULTIPLY}, { XK_KP_Divide, KEY_KP_DIVIDE}, - { XK_KP_Subtract, KEY_KP_SUBSTRACT}, + { XK_KP_Subtract, KEY_KP_SUBTRACT}, { XK_KP_Add, KEY_KP_ADD}, { XK_KP_0, KEY_KP_0}, { XK_KP_1, KEY_KP_1}, |