From d50a8576e70ab84af42fb0bbac56c2d74ddc1898 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 11 May 2019 07:25:22 +1000 Subject: Backport: Feature [feature-requests:#1283]. Standardise spelling - "color" -> "colour". Backport of changeset 7498:7dd63f4402ae. --- cocoa/PlatCocoa.mm | 2 +- cocoa/QuartzTextStyle.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cocoa') diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm index bdda8752b..20a160d8e 100644 --- a/cocoa/PlatCocoa.mm +++ b/cocoa/PlatCocoa.mm @@ -957,7 +957,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 12cc0e0b2..174149495 100644 --- a/cocoa/QuartzTextStyle.h +++ b/cocoa/QuartzTextStyle.h @@ -54,9 +54,9 @@ public: return styleDict; } - void setCTStyleColor(CGColor *inColor) + void setCTStyleColour(CGColor *inColour) { - CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, inColor); + CFDictionarySetValue(styleDict, kCTForegroundColorAttributeName, inColour); } float getAscent() const -- cgit v1.2.3