diff --git a/scintilla/src/EditView.cxx b/scintilla/src/EditView.cxx index 87064572d..a655ab281 100644 --- a/scintilla/src/EditView.cxx +++ b/scintilla/src/EditView.cxx @@ -2019,7 +2019,7 @@ void EditView::DrawLine(Surface *surface, const EditModel &model, const ViewStyl return; // No further drawing } - // See if something overrides the line background color. + // See if something overrides the line background colour. const ColourOptional background = vsDraw.Background(model.pdoc->GetMark(line), model.caret.active, ll->containsCaret); const Sci::Position posLineStart = model.pdoc->LineStart(line); diff --git a/scintilla/src/MarginView.cxx b/scintilla/src/MarginView.cxx index 7a6b3a4a0..13d55730f 100644 --- a/scintilla/src/MarginView.cxx +++ b/scintilla/src/MarginView.cxx @@ -420,7 +420,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, DrawStyledText(surface, vs, vs.marginStyleOffset, rcMarker, stMargin, 0, stMargin.length, drawAll); } else { - // if we're displaying annotation lines, color the margin to match the associated document line + // if we're displaying annotation lines, colour the margin to match the associated document line const int annotationLines = model.pdoc->AnnotationLines(lineDoc); if (annotationLines && (visibleLine > lastVisibleLine - annotationLines)) { surface->FillRectangle(rcMarker, vs.styles[stMargin.StyleAt(0) + vs.marginStyleOffset].back); diff --git a/scintilla/src/ViewStyle.cxx b/scintilla/src/ViewStyle.cxx index 202e7741b..e1bf3630a 100644 --- a/scintilla/src/ViewStyle.cxx +++ b/scintilla/src/ViewStyle.cxx @@ -443,12 +443,12 @@ bool ViewStyle::IsLineFrameOpaque(bool caretActive, bool lineContainsCaret) cons (caretLineAlpha == SC_ALPHA_NOALPHA) && lineContainsCaret; } -// See if something overrides the line background color: Either if caret is on the line -// and background color is set for that, or if a marker is defined that forces its background -// color onto the line, or if a marker is defined but has no selection margin in which to +// See if something overrides the line background colour: Either if caret is on the line +// and background colour is set for that, or if a marker is defined that forces its background +// colour onto the line, or if a marker is defined but has no selection margin in which to // display itself (as long as it's not an SC_MARK_EMPTY marker). These are checked in order // with the earlier taking precedence. When multiple markers cause background override, -// the color for the highest numbered one is used. +// the colour for the highest numbered one is used. ColourOptional ViewStyle::Background(int marksOfLine, bool caretActive, bool lineContainsCaret) const { ColourOptional background; if (!caretLineFrame && (caretActive || alwaysShowCaretLineBackground) && showCaretLineBackground && diff --git a/scintilla/src/XPM.cxx b/scintilla/src/XPM.cxx index 5df3ea7c9..f95580403 100644 --- a/scintilla/src/XPM.cxx +++ b/scintilla/src/XPM.cxx @@ -194,7 +194,7 @@ std::vector XPM::LinesFormFromTextForm(const char *textForm) { for (; countQuotes < (2*strings) && textForm[j] != '\0'; j++) { if (textForm[j] == '\"') { if (countQuotes == 0) { - // First field: width, height, number of colors, chars per pixel + // First field: width, height, number of colours, chars per pixel const char *line0 = textForm + j + 1; // Skip width line0 = NextField(line0); @@ -205,7 +205,7 @@ std::vector XPM::LinesFormFromTextForm(const char *textForm) { strings += atoi(line0); } if (countQuotes / 2 >= strings) { - break; // Bad height or number of colors! + break; // Bad height or number of colours! } if ((countQuotes & 1) == 0) { linesForm.push_back(textForm + j + 1); @@ -214,7 +214,7 @@ std::vector XPM::LinesFormFromTextForm(const char *textForm) { } } if (textForm[j] == '\0' || countQuotes / 2 > strings) { - // Malformed XPM! Height + number of colors too high or too low + // Malformed XPM! Height + number of colours too high or too low linesForm.clear(); } return linesForm; diff --git a/scintilla/win32/PlatWin.cxx b/scintilla/win32/PlatWin.cxx index 4107d9802..add8c1272 100644 --- a/scintilla/win32/PlatWin.cxx +++ b/scintilla/win32/PlatWin.cxx @@ -432,7 +432,7 @@ class SurfaceGDI : public Surface { int codePage = 0; - void BrushColor(ColourDesired back) noexcept; + void BrushColour(ColourDesired back) noexcept; void SetFont(const Font &font_) noexcept; void Clear() noexcept; @@ -573,7 +573,7 @@ void SurfaceGDI::PenColour(ColourDesired fore) { penOld = SelectPen(hdc, pen); } -void SurfaceGDI::BrushColor(ColourDesired back) noexcept { +void SurfaceGDI::BrushColour(ColourDesired back) noexcept { if (brush) { ::SelectObject(hdc, brushOld); ::DeleteObject(brush); @@ -614,7 +614,7 @@ void SurfaceGDI::LineTo(int x_, int y_) { void SurfaceGDI::Polygon(Point *pts, size_t npts, ColourDesired fore, ColourDesired back) { PenColour(fore); - BrushColor(back); + BrushColour(back); std::vector outline; for (size_t i=0; i(pts[i].x), static_cast(pts[i].y)}; @@ -625,7 +625,7 @@ void SurfaceGDI::Polygon(Point *pts, size_t npts, ColourDesired fore, ColourDesi void SurfaceGDI::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) { PenColour(fore); - BrushColor(back); + BrushColour(back); const RECT rcw = RectFromPRectangle(rc); ::Rectangle(hdc, rcw.left, rcw.top, rcw.right, rcw.bottom); } @@ -651,7 +651,7 @@ void SurfaceGDI::FillRectangle(PRectangle rc, Surface &surfacePattern) { void SurfaceGDI::RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back) { PenColour(fore); - BrushColor(back); + BrushColour(back); const RECT rcw = RectFromPRectangle(rc); ::RoundRect(hdc, rcw.left + 1, rcw.top, @@ -743,7 +743,7 @@ void SurfaceGDI::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fil } ::DeleteDC(hMemDC); } else { - BrushColor(outline); + BrushColour(outline); FrameRect(hdc, &rcw, brush); } } @@ -802,7 +802,7 @@ void SurfaceGDI::DrawRGBAImage(PRectangle rc, int width, int height, const unsig void SurfaceGDI::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) { PenColour(fore); - BrushColor(back); + BrushColour(back); const RECT rcw = RectFromPRectangle(rc); ::Ellipse(hdc, rcw.left, rcw.top, rcw.right, rcw.bottom); } diff --git a/src/Version.h b/src/Version.h index 630ac9e4d..6f2583dc9 100644 --- a/src/Version.h +++ b/src/Version.h @@ -73,7 +73,11 @@ #define VER_CPL MS Visual C++ 2019 v16.0.Prev(1-4) #endif #elif (_MSC_VER >= 1916) - #if(_MSC_FULL_VER >= 191627027) + #if(_MSC_FULL_VER >= 191627031) + #define VER_CPL MS Visual C++ 2017 v15.9.12 + #elif(_MSC_FULL_VER >= 191627030) + #define VER_CPL MS Visual C++ 2017 v15.9.11 + #elif(_MSC_FULL_VER >= 191627027) #define VER_CPL MS Visual C++ 2017 v15.9.(7-10) #elif(_MSC_FULL_VER >= 191627026) #define VER_CPL MS Visual C++ 2017 v15.9.(5-6) @@ -85,7 +89,7 @@ #define VER_CPL MS Visual C++ 2017 v15.9.(0-1) #endif #elif (_MSC_VER >= 1915) - #if(_MSC_FULL_VER >= 191526732) + #if(_MSC_FULL_VER >= 191526732) #define VER_CPL MS Visual C++ 2017 v15.8.(8-9) #elif(_MSC_FULL_VER >= 191526730) #define VER_CPL MS Visual C++ 2017 v15.8.(5-7)