diff --git a/lcl/interfaces/cocoa/cocoautils.pas b/lcl/interfaces/cocoa/cocoautils.pas index 1fbad9532a..abef8a87e8 100644 --- a/lcl/interfaces/cocoa/cocoautils.pas +++ b/lcl/interfaces/cocoa/cocoautils.pas @@ -230,7 +230,7 @@ begin kVK_ANSI_RightBracket : Result := VK_OEM_6; kVK_ANSI_O : Result := VK_O; kVK_ANSI_U : Result := VK_U; - kVK_ANSI_LeftBracket : Result := VK_LCL_OPEN_BRAKET; + kVK_ANSI_LeftBracket : Result := VK_LCL_OPEN_BRACKET; kVK_ANSI_I : Result := VK_I; kVK_ANSI_P : Result := VK_P; @@ -358,8 +358,8 @@ begin 'a'..'z': Result := VK_A+ord(ch)-ord('a'); 'A'..'Z': Result := ord(ch); '`','~': Result := VK_LCL_TILDE; - '[','{': Result := VK_LCL_OPEN_BRAKET; - ']','}': Result := VK_LCL_CLOSE_BRAKET; + '[','{': Result := VK_LCL_OPEN_BRACKET; + ']','}': Result := VK_LCL_CLOSE_BRACKET; '\','|': Result := VK_LCL_BACKSLASH; ';',':': Result := VK_LCL_SEMI_COMMA; '''','"': Result := VK_LCL_QUOTE; diff --git a/lcl/interfaces/customdrawn/customdrawn_cocoaproc.pas b/lcl/interfaces/customdrawn/customdrawn_cocoaproc.pas index 6338bab9a8..8d9de1051f 100644 --- a/lcl/interfaces/customdrawn/customdrawn_cocoaproc.pas +++ b/lcl/interfaces/customdrawn/customdrawn_cocoaproc.pas @@ -584,8 +584,8 @@ begin MK_MINUS: Result := VK_LCL_MINUS; MK_EQUAL: Result := VK_LCL_EQUAL; MK_BACKSLASH: Result := VK_LCL_BACKSLASH; - MK_LEFTBRACKET: Result := VK_LCL_OPEN_BRAKET; - MK_RIGHTBRACKET: Result := VK_LCL_CLOSE_BRAKET; + MK_LEFTBRACKET: Result := VK_LCL_OPEN_BRACKET; + MK_RIGHTBRACKET: Result := VK_LCL_CLOSE_BRACKET; MK_SEMICOLON: Result := VK_LCL_SEMI_COMMA; MK_QUOTE: Result := VK_LCL_QUOTE; MK_COMMA: Result := VK_LCL_COMMA; diff --git a/lcl/interfaces/customdrawn/customdrawnobject_android.inc b/lcl/interfaces/customdrawn/customdrawnobject_android.inc index 961e73bfaf..5cf10a8e16 100644 --- a/lcl/interfaces/customdrawn/customdrawnobject_android.inc +++ b/lcl/interfaces/customdrawn/customdrawnobject_android.inc @@ -708,8 +708,8 @@ begin KEYCODE_GRAVE: Result := VK_LCL_TILDE; KEYCODE_MINUS: Result := VK_LCL_MINUS; KEYCODE_EQUALS:Result := VK_LCL_EQUAL; - KEYCODE_LEFT_BRACKET: Result := VK_LCL_OPEN_BRAKET; - KEYCODE_RIGHT_BRACKET: Result := VK_LCL_CLOSE_BRAKET; + KEYCODE_LEFT_BRACKET: Result := VK_LCL_OPEN_BRACKET; + KEYCODE_RIGHT_BRACKET: Result := VK_LCL_CLOSE_BRACKET; KEYCODE_BACKSLASH: Result := VK_LCL_BACKSLASH; KEYCODE_SEMICOLON: Result := VK_LCL_SEMI_COMMA; KEYCODE_APOSTROPHE: Result := VK_LCL_QUOTE; diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas index 467ae832f9..52393d2d05 100644 --- a/lcl/lclproc.pas +++ b/lcl/lclproc.pas @@ -2093,8 +2093,8 @@ begin VK_LCL_SLASH: Result:='VK_LCL_SLASH'; VK_LCL_SEMI_COMMA:Result:='VK_LCL_SEMI_COMMA'; VK_LCL_MINUS :Result:='VK_LCL_MINUS'; - VK_LCL_OPEN_BRAKET:Result:='VK_LCL_OPEN_BRAKET'; - VK_LCL_CLOSE_BRAKET:Result:='VK_LCL_CLOSE_BRAKET'; + VK_LCL_OPEN_BRACKET: Result:='VK_LCL_OPEN_BRACKET'; + VK_LCL_CLOSE_BRACKET: Result:='VK_LCL_CLOSE_BRACKET'; VK_LCL_BACKSLASH :Result:='VK_LCL_BACKSLASH'; VK_LCL_TILDE :Result:='VK_LCL_TILDE'; VK_LCL_QUOTE :Result:='VK_LCL_QUOTE'; diff --git a/lcl/lcltype.pp b/lcl/lcltype.pp index 18c26f9ceb..cc523e7966 100644 --- a/lcl/lcltype.pp +++ b/lcl/lcltype.pp @@ -634,8 +634,12 @@ const VK_LCL_SLASH = VK_OEM_2; // The "/?" Key VK_LCL_SEMI_COMMA = VK_OEM_1; // The ";:" Key VK_LCL_MINUS = VK_OEM_MINUS; // The "-_" Key - VK_LCL_OPEN_BRAKET = VK_OEM_4; // The "[{" Key - VK_LCL_CLOSE_BRAKET= VK_OEM_6; // The "]}" Key + + VK_LCL_OPEN_BRAKET = VK_OEM_4; // deprecated 'Use VK_LCL_OPEN_BRACKET instead'; + VK_LCL_CLOSE_BRAKET= VK_OEM_6; // deprecated 'Use VK_LCL_CLOSE_BRACKET instead'; + VK_LCL_OPEN_BRACKET = VK_OEM_4; // The "[{" Key + VK_LCL_CLOSE_BRACKET= VK_OEM_6; // The "]}" Key + VK_LCL_BACKSLASH = VK_OEM_5; // The "\|" Key VK_LCL_TILDE = VK_OEM_3; // The "`~" Key VK_LCL_QUOTE = VK_OEM_7; // The "'"" Key