Change documentation references from OS X to macOS (#1927)
Since OS X 10.12 it has been named macOS so it makes sense to reference it in documentation as such, even when it sometimes refers to older versions which were called (Mac) OS X.
This commit is contained in:
@@ -931,13 +931,13 @@ enum wxKeyCode
|
||||
WXK_CLEAR,
|
||||
WXK_SHIFT,
|
||||
WXK_ALT,
|
||||
/** Note that under OS X, to improve compatibility with other
|
||||
/** Note that under macOS, to improve compatibility with other
|
||||
* systems, 'WXK_CONTROL' represents the 'Command' key. Use this
|
||||
* constant to work with keyboard shortcuts. See 'WXK_RAW_CONTROL'
|
||||
* to get the state of the actual 'Control' key.
|
||||
*/
|
||||
WXK_CONTROL,
|
||||
/** Under OS X, where the 'Command' key is mapped to 'Control'
|
||||
/** Under macOS, where the 'Command' key is mapped to 'Control'
|
||||
* to improve compatibility with other systems, WXK_RAW_CONTROL may
|
||||
* be used to obtain the state of the actual 'Control' key
|
||||
* ('WXK_CONTROL' would obtain the status of the 'Command' key).
|
||||
@@ -1035,7 +1035,7 @@ enum wxKeyCode
|
||||
WXK_WINDOWS_RIGHT,
|
||||
WXK_WINDOWS_MENU ,
|
||||
|
||||
/** This special key code was used to represent the key used for keyboard shortcuts. Under OS X,
|
||||
/** This special key code was used to represent the key used for keyboard shortcuts. Under macOS,
|
||||
* this key maps to the 'Command' (aka logo or 'Apple') key, whereas on Linux/Windows/others
|
||||
* this is the Control key, with the new semantic of WXK_CONTROL, WXK_COMMAND is not needed anymore
|
||||
*/
|
||||
@@ -1089,14 +1089,14 @@ enum wxKeyModifier
|
||||
{
|
||||
wxMOD_NONE = 0x0000,
|
||||
wxMOD_ALT = 0x0001,
|
||||
/** Ctlr Key, corresponds to Command key on OS X */
|
||||
/** Ctlr Key, corresponds to Command key on macOS */
|
||||
wxMOD_CONTROL = 0x0002,
|
||||
wxMOD_ALTGR = wxMOD_ALT | wxMOD_CONTROL,
|
||||
wxMOD_SHIFT = 0x0004,
|
||||
wxMOD_META = 0x0008,
|
||||
wxMOD_WIN = wxMOD_META,
|
||||
|
||||
/** used to describe the true Ctrl Key under OS X,
|
||||
/** used to describe the true Ctrl Key under macOS,
|
||||
identic to @c wxMOD_CONTROL on other platforms */
|
||||
wxMOD_RAW_CONTROL,
|
||||
|
||||
|
Reference in New Issue
Block a user