Feature [feature-requests:#1283]. Standardise spelling - "color" -> "colour".

7 files changed, 19 insertions, 19 deletions

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 2b41f476d..9b73b3dcf 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -1116,7 +1116,7 @@ void SurfaceImpl::DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION yba
 	CGColorRef color = CGColorCreateGenericRGB(colour.GetRed()/255.0, colour.GetGreen()/255.0, colour.GetBlue()/255.0, 1.0);
 
 	QuartzTextStyle *style = TextStyleFromFont(font_);
-	style->setCTStyleColor(color);
+	style->setCTStyleColour(color);
 
 	CGColorRelease(color);
 
diff --git a/cocoa/QuartzTextStyle.h b/cocoa/QuartzTextStyle.h
index 8572f5270..57ea6c7a3 100644
--- a/cocoa/QuartzTextStyle.h
+++ b/cocoa/QuartzTextStyle.h
@@ -47,8 +47,8 @@ public:
 		return styleDict;
 	}
 
-	void setCTStyleColor(CGColor *inColor) {
-		CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, inColor);
+	void setCTStyleColour(CGColor *inColour) {
+		CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, inColour);
 	}
 
 	float getAscent() const {
diff --git a/src/EditView.cxx b/src/EditView.cxx
index 59e559ea5..f3185ecc8 100644
--- a/src/EditView.cxx
+++ b/src/EditView.cxx
@@ -2017,7 +2017,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 7a6b3a4a0..13d55730f 100644
--- a/src/MarginView.cxx
+++ b/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/src/ViewStyle.cxx b/src/ViewStyle.cxx
index aa3c4e477..cfd9701ae 100644
--- a/src/ViewStyle.cxx
+++ b/src/ViewStyle.cxx
@@ -441,12 +441,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 5df3ea7c9..f95580403 100644
--- a/src/XPM.cxx
+++ b/src/XPM.cxx
@@ -194,7 +194,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);
@@ -205,7 +205,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);
@@ -214,7 +214,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;
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index d9c3a232f..28587b917 100644
--- a/win32/PlatWin.cxx
+++ b/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<POINT> outline;
 	for (size_t i=0; i<npts; i++) {
 		POINT pt = {static_cast<LONG>(pts[i].x), static_cast<LONG>(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,
@@ -741,7 +741,7 @@ void SurfaceGDI::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fil
 		}
 		::DeleteDC(hMemDC);
 	} else {
-		BrushColor(outline);
+		BrushColour(outline);
 		FrameRect(hdc, &rcw, brush);
 	}
 }
@@ -798,7 +798,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);
 }