diff --git a/mac/Keyman4Mac/Keyman4Mac/WindowsVKCodes.h b/mac/Keyman4Mac/Keyman4Mac/WindowsVKCodes.h deleted file mode 100644 index b7a15b2ca94..00000000000 --- a/mac/Keyman4Mac/Keyman4Mac/WindowsVKCodes.h +++ /dev/null @@ -1,79 +0,0 @@ -// -// WindowsVKCodes.h -// Keyman4Mac -// -// Created by Serkan Kurt on 2/12/2014. -// Copyright (c) 2017 SIL International. All rights reserved. -// - -#define VK_BACKSPACE 0x08 -#define VK_TAB 0x09 -#define VK_ENTER 0x0D -#define VK_SPACE 0x20 - -#define VK_KEY_0 0x30 -#define VK_KEY_1 0x31 -#define VK_KEY_2 0x32 -#define VK_KEY_3 0x33 -#define VK_KEY_4 0x34 -#define VK_KEY_5 0x35 -#define VK_KEY_6 0x36 -#define VK_KEY_7 0x37 -#define VK_KEY_8 0x38 -#define VK_KEY_9 0x39 -#define VK_KEY_A 0x41 -#define VK_KEY_B 0x42 -#define VK_KEY_C 0x43 -#define VK_KEY_D 0x44 -#define VK_KEY_E 0x45 -#define VK_KEY_F 0x46 -#define VK_KEY_G 0x47 -#define VK_KEY_H 0x48 -#define VK_KEY_I 0x49 -#define VK_KEY_J 0x4A -#define VK_KEY_K 0x4B -#define VK_KEY_L 0x4C -#define VK_KEY_M 0x4D -#define VK_KEY_N 0x4E -#define VK_KEY_O 0x4F -#define VK_KEY_P 0x50 -#define VK_KEY_Q 0x51 -#define VK_KEY_R 0x52 -#define VK_KEY_S 0x53 -#define VK_KEY_T 0x54 -#define VK_KEY_U 0x55 -#define VK_KEY_V 0x56 -#define VK_KEY_W 0x57 -#define VK_KEY_X 0x58 -#define VK_KEY_Y 0x59 -#define VK_KEY_Z 0x5A - -#define VK_NUMPAD0 0x60 -#define VK_NUMPAD1 0x61 -#define VK_NUMPAD2 0x62 -#define VK_NUMPAD3 0x63 -#define VK_NUMPAD4 0x64 -#define VK_NUMPAD5 0x65 -#define VK_NUMPAD6 0x66 -#define VK_NUMPAD7 0x67 -#define VK_NUMPAD8 0x68 -#define VK_NUMPAD9 0x69 - -#define VK_NUMPAD_MULTIPLY 0x6A -#define VK_NUMPAD_ADD 0x6B -#define VK_NUMPAD_SUBTRACT 0x6D -#define VK_NUMPAD_DECIMAL 0x6E -#define VK_NUMPAD_DIVIDE 0x6F -#define VK_NUMLOCK 0x90 - -#define VK_COMMA 0xBC -#define VK_MINUS 0xBD -#define VK_PERIOD 0xBE -#define VK_EQUAL 0xBB -#define VK_SEMICOLON 0xBA -#define VK_SLASH 0xBF -#define VK_GRAVE 0xC0 -#define VK_LEFT_BRACKET 0xDB -#define VK_BACKSLASH 0xDC -#define VK_RIGHT_BRACKET 0xDD -#define VK_QUOTE 0xDE diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m index c7858e7b0d9..ad2b88121a4 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/CoreWrapper/CoreHelper.m @@ -18,7 +18,7 @@ #import "CoreAction.h" #import "keyman_core_api.h" #import "MacVKCodes.h" -#import "WindowsVKCodes.h" +#import "km_vkey.h" #import "KMELogs.h" const int VIRTUAL_KEY_ARRAY_SIZE = 0x80; diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m index fd59c48b620..01f59f0a975 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/KMEngine.m @@ -8,7 +8,7 @@ #import "KMEngine.h" #import "KMBinaryFileFormat.h" -#import "WindowsVKCodes.h" +#import "km_vkey.h" #import "MacVKCodes.h" #import "CoreWrapper.h" #import "KMELogs.h" diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m index e576d000b8c..f133609a869 100644 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m +++ b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/OnScreenKeyboard/OSKView.m @@ -10,7 +10,7 @@ #import "OSKKey.h" #import "KeyView.h" #import "MacVKCodes.h" -#import "WindowsVKCodes.h" +#import "km_vkey.h" #import "NKey.h" #import "CoreHelper.h" diff --git a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/WindowsVKCodes.h b/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/WindowsVKCodes.h deleted file mode 100644 index 2fc5ba7f797..00000000000 --- a/mac/KeymanEngine4Mac/KeymanEngine4Mac/KME/WindowsVKCodes.h +++ /dev/null @@ -1,86 +0,0 @@ -// -// WindowsVKCodes.h -// KeymanEngine4Mac -// -// Created by Serkan Kurt on 2/12/2014. -// Copyright (c) 2017 SIL International. All rights reserved. -// - -#ifndef WindowsVKCodes_h -#define WindowsVKCodes_h - -#define VK_BACKSPACE 0x08 -#define VK_TAB 0x09 -#define VK_ENTER 0x0D -#define VK_SPACE 0x20 - -#define VK_KEY_0 0x30 -#define VK_KEY_1 0x31 -#define VK_KEY_2 0x32 -#define VK_KEY_3 0x33 -#define VK_KEY_4 0x34 -#define VK_KEY_5 0x35 -#define VK_KEY_6 0x36 -#define VK_KEY_7 0x37 -#define VK_KEY_8 0x38 -#define VK_KEY_9 0x39 -#define VK_KEY_A 0x41 -#define VK_KEY_B 0x42 -#define VK_KEY_C 0x43 -#define VK_KEY_D 0x44 -#define VK_KEY_E 0x45 -#define VK_KEY_F 0x46 -#define VK_KEY_G 0x47 -#define VK_KEY_H 0x48 -#define VK_KEY_I 0x49 -#define VK_KEY_J 0x4A -#define VK_KEY_K 0x4B -#define VK_KEY_L 0x4C -#define VK_KEY_M 0x4D -#define VK_KEY_N 0x4E -#define VK_KEY_O 0x4F -#define VK_KEY_P 0x50 -#define VK_KEY_Q 0x51 -#define VK_KEY_R 0x52 -#define VK_KEY_S 0x53 -#define VK_KEY_T 0x54 -#define VK_KEY_U 0x55 -#define VK_KEY_V 0x56 -#define VK_KEY_W 0x57 -#define VK_KEY_X 0x58 -#define VK_KEY_Y 0x59 -#define VK_KEY_Z 0x5A - -#define VK_NUMPAD0 0x60 -#define VK_NUMPAD1 0x61 -#define VK_NUMPAD2 0x62 -#define VK_NUMPAD3 0x63 -#define VK_NUMPAD4 0x64 -#define VK_NUMPAD5 0x65 -#define VK_NUMPAD6 0x66 -#define VK_NUMPAD7 0x67 -#define VK_NUMPAD8 0x68 -#define VK_NUMPAD9 0x69 - -#define VK_NUMPAD_MULTIPLY 0x6A -#define VK_NUMPAD_ADD 0x6B -#define VK_NUMPAD_SUBTRACT 0x6D -#define VK_NUMPAD_DECIMAL 0x6E -#define VK_NUMPAD_DIVIDE 0x6F -#define VK_NUMLOCK 0x90 - -#define VK_COMMA 0xBC -#define VK_MINUS 0xBD -#define VK_PERIOD 0xBE -#define VK_EQUAL 0xBB -#define VK_SEMICOLON 0xBA -#define VK_SLASH 0xBF -#define VK_GRAVE 0xC0 -#define VK_LEFT_BRACKET 0xDB -#define VK_BACKSLASH 0xDC -#define VK_RIGHT_BRACKET 0xDD -#define VK_QUOTE 0xDE - -#define VK_OEM_102 0xE2 - -#endif /* WindowsVKCodes_h */