diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/EditView.cxx | 2 | ||||
| -rw-r--r-- | src/MarginView.cxx | 2 | ||||
| -rw-r--r-- | src/ViewStyle.cxx | 8 | ||||
| -rw-r--r-- | src/XPM.cxx | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/EditView.cxx b/src/EditView.cxx index 7ce152489..fdcd9f287 100644 --- a/src/EditView.cxx +++ b/src/EditView.cxx @@ -1888,7 +1888,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/src/MarginView.cxx b/src/MarginView.cxx index a2fea70a7..e6f73c52a 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -419,7 +419,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/src/ViewStyle.cxx b/src/ViewStyle.cxx index a4535abca..d6fd42a6d 100644 --- a/src/ViewStyle.cxx +++ b/src/ViewStyle.cxx @@ -440,12 +440,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/src/XPM.cxx b/src/XPM.cxx index 6de9ce98b..f2565bf83 100644 --- a/src/XPM.cxx +++ b/src/XPM.cxx @@ -193,7 +193,7 @@ std::vector<const char *> 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); @@ -204,7 +204,7 @@ std::vector<const char *> 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); @@ -213,7 +213,7 @@ std::vector<const char *> 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; |