From dbb3dbe28d22720639967832cef6f6e8163d472a Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 11 May 2019 07:25:22 +1000 Subject: Feature [feature-requests:#1283]. Standardise spelling - "color" -> "colour". --- win32/PlatWin.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'win32') 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 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, @@ -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); } -- cgit v1.2.3