aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/PlatCocoa.mm4
-rw-r--r--cocoa/ScintillaCocoa.h2
-rw-r--r--cocoa/ScintillaCocoa.mm14
-rwxr-xr-xcocoa/checkbuildosx.sh4
-rw-r--r--doc/SciCoding.html2
-rw-r--r--doc/ScintillaDoc.html22
-rw-r--r--doc/index.html2
-rwxr-xr-xgtk/PlatGTK.cxx1
-rwxr-xr-xgtk/ScintillaGTK.cxx2
-rw-r--r--include/Scintilla.iface6
-rw-r--r--qt/ScintillaEditBase/Notes.txt2
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp4
-rw-r--r--qt/ScintillaEditBase/ScintillaQt.cpp4
-rw-r--r--src/KeyMap.cxx2
-rw-r--r--test/unit/README4
-rw-r--r--test/unit/makefile6
16 files changed, 40 insertions, 41 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
diff --git a/doc/SciCoding.html b/doc/SciCoding.html
index e27cf5b30..19a13a7f7 100644
--- a/doc/SciCoding.html
+++ b/doc/SciCoding.html
@@ -134,7 +134,7 @@
Exceptions and templates may be used but, since Scintilla can be used from C as well as
C++, exceptions may not be thrown out of Scintilla and all exceptions should be caught
before returning from Scintilla.
- A 'Scintilla' name space is used. This helps with name clashes on OS X.
+ A 'Scintilla' name space is used. This helps with name clashes on macOS.
</p>
<p>
The goto statement is not used because of bad memories from my first job
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 932d26de8..c463dc3c2 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -169,7 +169,7 @@
<p>The GTK version also uses messages in a similar way to the Windows version. This is
different to normal GTK practice but made it easier to implement rapidly.</p>
- <p>Scintilla also builds with Cocoa on OS X and with Qt, and follows the conventions of
+ <p>Scintilla also builds with Cocoa on macOS and with Qt, and follows the conventions of
those platforms.</p>
<p>Scintilla provides only limited experimental support on Windows for right-to-left languages
@@ -5177,7 +5177,7 @@ struct Sci_TextToFind {
<a class="jump" href="#RGBA">RGBA format</a> is used for the pixmap.
The width and height must previously been set with the <code>SCI_RGBAIMAGESETWIDTH</code> and
<code>SCI_RGBAIMAGESETHEIGHT</code> messages.</p>
- <p>A scale factor in percent may be set with <code>SCI_RGBAIMAGESETSCALE</code>. This is useful on OS X with
+ <p>A scale factor in percent may be set with <code>SCI_RGBAIMAGESETSCALE</code>. This is useful on macOS with
a retina display where each display unit is 2 pixels: use a factor of 200 so that each image pixel is displayed using a screen pixel.
The default scale, 100, will stretch each image pixel to cover 4 screen pixels on a retina display.</p>
<p>Pixmaps use the <code>SC_MARK_RGBAIMAGE</code> marker symbol. </p>
@@ -5562,7 +5562,7 @@ struct Sci_TextToFind {
<td>A version of <code>INDIC_SQUIGGLE</code> that draws using a pixmap instead of
as a series of line segments for performance.
Measured to be between 3 and 6 times faster than <code>INDIC_SQUIGGLE</code> on GTK.
- Appearance will not be as good as <code>INDIC_SQUIGGLE</code> on OS X in HiDPI mode.</td>
+ Appearance will not be as good as <code>INDIC_SQUIGGLE</code> on macOS in HiDPI mode.</td>
</tr>
<tr>
@@ -5728,11 +5728,11 @@ struct Sci_TextToFind {
Can be used to iterate through the document to discover all the indicator positions.
</p>
- <h3 id="FindIndicators">OS X Find Indicator</h3>
+ <h3 id="FindIndicators">macOS Find Indicator</h3>
- <p>On OS X search matches are highlighted with an animated gold rounded rectangle.
+ <p>On macOS search matches are highlighted with an animated gold rounded rectangle.
The indicator shows, then briefly grows 25% and shrinks to the original size to draw the user's attention.
- While this feature is currently only implemented on OS X, it may be implemented on other platforms
+ While this feature is currently only implemented on macOS, it may be implemented on other platforms
in the future.</p>
<p><b id="SCI_FINDINDICATORSHOW">SCI_FINDINDICATORSHOW(position start, position end)</b><br />
@@ -5740,7 +5740,7 @@ struct Sci_TextToFind {
These two messages show and animate the find indicator. The indicator remains visible with
<code>SCI_FINDINDICATORSHOW</code> and fades out after showing for half a second with
<code>SCI_FINDINDICATORFLASH</code>.
- <code>SCI_FINDINDICATORSHOW</code> behaves similarly to the OS X TextEdit and Safari applications
+ <code>SCI_FINDINDICATORSHOW</code> behaves similarly to the macOS TextEdit and Safari applications
and is best suited to editing documentation where the search target is often a word.
<code>SCI_FINDINDICATORFLASH</code> is similar to Xcode and is suited to editing source code
where the match will often be located next to operators which would otherwise be hidden under the indicator's
@@ -6471,8 +6471,8 @@ struct Sci_TextToFind {
</p>
<p>The <code>SCI_SCROLLTO[START|END]</code> commands scroll the document to the start
- or end without changing the selection. These commands match OS X platform conventions for the behaviour of the
- <code>home</code> and <code>end</code> keys. Scintilla can be made to match OS X applications
+ or end without changing the selection. These commands match macOS platform conventions for the behaviour of the
+ <code>home</code> and <code>end</code> keys. Scintilla can be made to match macOS applications
by binding the <code>home</code> and <code>end</code> keys to these commands.
</p>
@@ -6514,7 +6514,7 @@ struct Sci_TextToFind {
<p>The modifiers are a combination of zero or more of <code>SCMOD_ALT</code>,
<code>SCMOD_CTRL</code>, <code>SCMOD_SHIFT</code>,
<code>SCMOD_META</code>, and <code>SCMOD_SUPER</code>.
- On OS X, the Command key is mapped to <code>SCMOD_CTRL</code> and the Control key to
+ On macOS, the Command key is mapped to <code>SCMOD_CTRL</code> and the Control key to
<code>SCMOD_META</code>.
<code>SCMOD_SUPER</code> is only available on GTK which is commonly the Windows key.
If you are building a table, you might
@@ -9415,7 +9415,7 @@ for line = lineStart to lineEnd do SCI_ENSUREVISIBLE(line) next
If there is no suitable platform support, the <a href="http://lodev.org/lodepng/">LodePNG and picoPNG</a> libraries are small libraries
for loading and decoding PNG files available under a BSD-style license.</p>
- <p>RGBA format is supported on Windows, GTK and OS X Cocoa.</p>
+ <p>RGBA format is supported on Windows, GTK and macOS Cocoa.</p>
<h3 id="XPM">XPM</h3>
diff --git a/doc/index.html b/doc/index.html
index 36608905c..ba402d1cc 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -53,7 +53,7 @@
</td>
<td width="40%" align="left">
<font color="#FFCC99" size="4"> A free source code editing component for Win32,
- GTK, and OS X</font>
+ GTK, and macOS</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 5.2.0<br />
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 859589bec..d79539ffa 100755
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -117,7 +117,6 @@ std::shared_ptr<Font> Font::Allocate(const FontParameters &fp) {
return std::make_shared<FontHandle>(fp);
}
-// Required on OS X
namespace Scintilla {
// SurfaceID is a cairo_t*
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 77a18e442..bc6402e30 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1965,7 +1965,7 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) {
// Compute amount and direction to scroll (even tho on win32 there is
// intensity of scrolling info in the native message, gtk doesn't
// support this so we simulate similarly adaptive scrolling)
- // Note that this is disabled on OS X (Darwin) with the X11 backend
+ // Note that this is disabled on macOS (Darwin) with the X11 backend
// where the X11 server already has an adaptive scrolling algorithm
// that fights with this one
int cLineScroll;
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 88e375e74..36d771402 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -2930,13 +2930,13 @@ get Technology GetTechnology=2631(,)
# Create an ILoader*.
fun pointer CreateLoader=2632(position bytes, DocumentOption documentOptions)
-# On OS X, show a find indicator.
+# On macOS, show a find indicator.
fun void FindIndicatorShow=2640(position start, position end)
-# On OS X, flash a find indicator, then fade out.
+# On macOS, flash a find indicator, then fade out.
fun void FindIndicatorFlash=2641(position start, position end)
-# On OS X, hide the find indicator.
+# On macOS, hide the find indicator.
fun void FindIndicatorHide=2642(,)
# Move caret to before first visible character on display line.
diff --git a/qt/ScintillaEditBase/Notes.txt b/qt/ScintillaEditBase/Notes.txt
index 4abc9bb78..d5d382aa4 100644
--- a/qt/ScintillaEditBase/Notes.txt
+++ b/qt/ScintillaEditBase/Notes.txt
@@ -10,7 +10,7 @@ There's a comment in the Qt code for Windows:
The clocks used aren't great. QTime is a time since midnight clock so wraps around and
is only accurate to, at best, milliseconds.
-On OS X drawing text into a pixmap moves it around 1 pixel to the right compared to drawing
+On macOS drawing text into a pixmap moves it around 1 pixel to the right compared to drawing
it directly onto a window. Buffered drawing turned off by default to avoid this.
Reported as QTBUG-19483.
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 5ce1c1b66..c6163a742 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -996,7 +996,7 @@ void ListBoxImpl::Create(Window &parent,
#endif
);
#else
- // On OS X, Qt::Tool takes focus so main window loses focus so
+ // On macOS, Qt::Tool takes focus so main window loses focus so
// keyboard stops working. Qt::ToolTip works but its only really
// documented for tooltips.
// On Linux / X this setting allows clicking on list items.
@@ -1068,7 +1068,7 @@ int ListBoxImpl::CaretFromEdge()
}
int extra;
- // The 12 is from trial and error on OS X and the 7
+ // The 12 is from trial and error on macOS and the 7
// is from trial and error on Windows - there may be
// a better programmatic way to find any padding factors.
#ifdef Q_OS_DARWIN
diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp
index d2635668e..c1276adc1 100644
--- a/qt/ScintillaEditBase/ScintillaQt.cpp
+++ b/qt/ScintillaEditBase/ScintillaQt.cpp
@@ -35,7 +35,7 @@ ScintillaQt::ScintillaQt(QAbstractScrollArea *parent)
imeInteraction = IMEInteraction::Inline;
- // On OS X drawing text into a pixmap moves it around 1 pixel to
+ // On macOS drawing text into a pixmap moves it around 1 pixel to
// the right compared to drawing it directly onto a window.
// Buffered drawing turned off by default to avoid this.
view.bufferedDraw = false;
@@ -178,7 +178,7 @@ static void AddRectangularToMime(QMimeData *mimeData, [[maybe_unused]] const QSt
// Add an empty marker
mimeData->setData(sMSDEVColumnSelect, QByteArray());
#elif defined(Q_OS_MAC)
- // OS X gets marker + data to work with other implementations.
+ // macOS gets marker + data to work with other implementations.
// Don't understand how this works but it does - the
// clipboard format is supposed to be UTF-16, not UTF-8.
mimeData->setData(sScintillaRecMimeType, su.toUtf8());
diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx
index 6e112479d..8d6857546 100644
--- a/src/KeyMap.cxx
+++ b/src/KeyMap.cxx
@@ -56,7 +56,7 @@ const std::map<KeyModifiers, Message> &KeyMap::GetKeyMap() const noexcept {
#endif
// Define a modifier that is exactly Ctrl key on all platforms
-// Most uses of Ctrl map to Cmd on OS X but some can't so use SCI_[S]CTRL_META
+// Most uses of Ctrl map to Cmd on macOS but some can't so use SCI_[S]CTRL_META
#if OS_X_KEYS
#define SCI_CTRL_META SCI_META
#define SCI_SCTRL_META (SCI_META | SCI_SHIFT)
diff --git a/test/unit/README b/test/unit/README
index 2558d8e86..87b660108 100644
--- a/test/unit/README
+++ b/test/unit/README
@@ -1,11 +1,11 @@
The test/unit directory contains unit tests for Scintilla data structures.
-The tests can be run on Windows, OS X, or Linux using g++ and GNU make.
+The tests can be run on Windows, macOS, or Linux using g++ and GNU make.
The Catch test framework is used.
https://github.com/philsquared/Catch
The file catch.hpp is under the Boost Software License which is contained in LICENSE_1_0.txt
- To run the tests on OS X or Linux:
+ To run the tests on macOS or Linux:
make test
To run the tests on Windows:
diff --git a/test/unit/makefile b/test/unit/makefile
index 572ea1443..89766826f 100644
--- a/test/unit/makefile
+++ b/test/unit/makefile
@@ -1,6 +1,6 @@
# Build all the unit tests using GNU make and either g++ or clang
# Should be run using mingw32-make on Windows, not nmake
-# On Windows g++ is used, on OS X clang, and on Linux G++ is used by default
+# On Windows g++ is used, on macOS clang, and on Linux G++ is used by default
# but clang can be used by defining CLANG when invoking make
# clang works only with libc++, not libstdc++
# Tested with clang 9 and g++ 9
@@ -9,7 +9,7 @@ CXXSTD=c++17
ifndef windir
ifeq ($(shell uname),Darwin)
-# On OS X always use clang as g++ is old version
+# On macOS (detected with Darwin uname) always use clang as g++ is old version
CLANG = 1
USELIBCPP = 1
endif
@@ -22,7 +22,7 @@ ifdef CLANG
CXX = clang++
CXXFLAGS += -D_CRT_SECURE_NO_DEPRECATE
ifdef USELIBCPP
-# OS X, use libc++ but don't have sanitizers
+# macOS, use libc++ but don't have sanitizers
CXXFLAGS += --stdlib=libc++
LINKFLAGS = -lc++
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 13:46:25 +0000