diff options
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/PlatCocoa.mm | 4 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.h | 2 | ||||
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 14 | ||||
| -rwxr-xr-x | cocoa/checkbuildosx.sh | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index bec420a66..d139a4084 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -1,6 +1,6 @@ /** * Scintilla source code edit control - * @file PlatCocoa.mm - implementation of platform facilities on MacOS X/Cocoa + * @file PlatCocoa.mm - implementation of platform facilities on macOS/Cocoa * * Written by Mike Lischke * Based on PlatMacOSX.cxx @@ -1591,7 +1591,7 @@ void Window::SetPositionRelative(PRectangle rc, const Window *window) { //-------------------------------------------------------------------------------------------------- PRectangle Window::GetClientPosition() const { - // This means, in MacOS X terms, get the "frame bounds". Call GetPosition, just like on Win32. + // This means, in macOS terms, get the "frame bounds". Call GetPosition, just like on Win32. return GetPosition(); } diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h index 311bcfa23..63f4b106b 100644 --- a/cocoa/ScintillaCocoa.h +++ b/cocoa/ScintillaCocoa.h @@ -84,7 +84,7 @@ extern "C" NSString *ScintillaRecPboardType; namespace Scintilla::Internal { /** - * Main scintilla class, implemented for OS X (Cocoa). + * Main scintilla class, implemented for macOS (Cocoa). */ class ScintillaCocoa : public ScintillaBase { private: diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index dc70a0ae9..09357eb39 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -59,7 +59,7 @@ constexpr Keys Key(char ch) { } static const KeyToCommand macMapDefault[] = { - // OS X specific + // macOS specific {Keys::Down, SCI_CTRL, Message::DocumentEnd}, {Keys::Down, SCI_CSHIFT, Message::DocumentEndExtend}, {Keys::Up, SCI_CTRL, Message::DocumentStart}, @@ -70,7 +70,7 @@ static const KeyToCommand macMapDefault[] = { {Keys::Right, SCI_CSHIFT, Message::LineEndExtend}, // Similar to Windows and GTK+ - // Where equivalent clashes with OS X standard, use Meta instead + // Where equivalent clashes with macOS standard, use Meta instead {Keys::Down, SCI_NORM, Message::LineDown}, {Keys::Down, SCI_SHIFT, Message::LineDownExtend}, {Keys::Down, SCI_META, Message::LineScrollDown}, @@ -157,10 +157,10 @@ static const KeyToCommand macMapDefault[] = { #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5 -// Only implement FindHighlightLayer on OS X 10.6+ +// Only implement FindHighlightLayer on macOS 10.6+ /** - * Class to display the animated gold roundrect used on OS X for matches. + * Class to display the animated gold roundrect used on macOS for matches. */ @interface FindHighlightLayer : CAGradientLayer { @private @@ -1145,7 +1145,7 @@ void ScintillaCocoa::CTPaint(void *gc, NSRect rc) { } } -// On OS X, only the key view should modify the cursor so the calltip can't. +// On macOS, only the key view should modify the cursor so the calltip can't. // This view does not become key so resetCursorRects never called. - (void) resetCursorRects { //[super resetCursorRects]; @@ -1214,7 +1214,7 @@ void ScintillaCocoa::AddToPopUp(const char *label, int cmd, bool enabled) { // ------------------------------------------------------------------------------------------------- void ScintillaCocoa::ClaimSelection() { - // Mac OS X does not have a primary selection. + // macOS does not have a primary selection. } // ------------------------------------------------------------------------------------------------- @@ -2141,7 +2141,7 @@ bool ScintillaCocoa::Draw(NSRect rect, CGContextRef gc) { //-------------------------------------------------------------------------------------------------- /** - * Helper function to translate OS X key codes to Scintilla key codes. + * Helper function to translate macOS key codes to Scintilla key codes. */ static inline Keys KeyTranslate(UniChar unicodeChar, NSEventModifierFlags modifierFlags) { switch (unicodeChar) { diff --git a/cocoa/checkbuildosx.sh b/cocoa/checkbuildosx.sh index 6dc063bc2..f342715aa 100755 --- a/cocoa/checkbuildosx.sh +++ b/cocoa/checkbuildosx.sh @@ -1,4 +1,4 @@ -# Script to build Scintilla for OS X with most supported build files. +# Script to build Scintilla for macOS with most supported build files. # Current directory should be scintilla/cocoa before running. cd ../.. @@ -14,7 +14,7 @@ make test cd ../../.. # ************************************************************ -# Target 2: build framework and test app with Xcode targeting OS X 10.n with n from 9 to 5 +# Target 2: build framework and test app with Xcode targeting macOS 10.n with n from 9 to 5 # Only SDK versions that are installed will be built # Clean both then build both -- if perform clean in ScintillaTest, also cleans ScintillaFramework # which can cause double build |