diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-02-17 23:33:13 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-02-17 23:33:13 +0100 |
| commit | 16b0cf8bcbaacb02533e8f334b30931139b6d6dd (patch) | |
| tree | 2822e0e12de6572f5c7f26407327444586614ea7 /core | |
| parent | 66d6dd3a26a9c69ad96906059b908cb6e59e6c32 (diff) | |
| parent | 130f8fa1936f672ec34fd0270e1d2c0577f95eed (diff) | |
Merge pull request #3754 from akien-mga/pr-subtract
Rename KEY_KP_SUBSTRACT to KEY_KP_SUBTRACT
Diffstat (limited to 'core')
| -rw-r--r-- | core/global_constants.cpp | 2 | ||||
| -rw-r--r-- | core/os/keyboard.cpp | 2 | ||||
| -rw-r--r-- | core/os/keyboard.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/global_constants.cpp b/core/global_constants.cpp index c306744d35..a183255b06 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -106,7 +106,7 @@ static _GlobalConstant _global_constants[]={ BIND_GLOBAL_CONSTANT( KEY_KP_ENTER ), BIND_GLOBAL_CONSTANT( KEY_KP_MULTIPLY ), BIND_GLOBAL_CONSTANT( KEY_KP_DIVIDE ), - BIND_GLOBAL_CONSTANT( KEY_KP_SUBSTRACT ), + BIND_GLOBAL_CONSTANT( KEY_KP_SUBTRACT ), BIND_GLOBAL_CONSTANT( KEY_KP_PERIOD ), BIND_GLOBAL_CONSTANT( KEY_KP_ADD ), BIND_GLOBAL_CONSTANT( KEY_KP_0 ), diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp index 633aa06a9a..4c0a074a07 100644 --- a/core/os/keyboard.cpp +++ b/core/os/keyboard.cpp @@ -82,7 +82,7 @@ static const _KeyCodeText _keycodes[]={ {KEY_KP_ENTER ,"Kp Enter"}, {KEY_KP_MULTIPLY ,"Kp Multiply"}, {KEY_KP_DIVIDE ,"Kp Divide"}, - {KEY_KP_SUBSTRACT ,"Kp Substract"}, + {KEY_KP_SUBTRACT ,"Kp Subtract"}, {KEY_KP_PERIOD ,"Kp Period"}, {KEY_KP_ADD ,"Kp Add"}, {KEY_KP_0 ,"Kp 0"}, diff --git a/core/os/keyboard.h b/core/os/keyboard.h index 69e74d1252..0848f8c28e 100644 --- a/core/os/keyboard.h +++ b/core/os/keyboard.h @@ -98,7 +98,7 @@ enum KeyList { KEY_KP_ENTER=SPKEY | 0x80, KEY_KP_MULTIPLY=SPKEY | 0x81, KEY_KP_DIVIDE=SPKEY | 0x82, - KEY_KP_SUBSTRACT=SPKEY | 0x83, + KEY_KP_SUBTRACT=SPKEY | 0x83, KEY_KP_PERIOD=SPKEY | 0x84, KEY_KP_ADD=SPKEY | 0x85, KEY_KP_0=SPKEY | 0x86, |