Modernize Platform.h (3) - update Surface to delete WidthChar, use size_t for

Polygon and delete the standard copy and assignment methods.

1 files changed, 2 insertions, 13 deletions

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 704645cb6..9f04870c2 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -376,12 +376,12 @@ void SurfaceImpl::LineTo(int x_, int y_) {
 
 //--------------------------------------------------------------------------------------------------
 
-void SurfaceImpl::Polygon(Scintilla::Point *pts, int npts, ColourDesired fore,
+void SurfaceImpl::Polygon(Scintilla::Point *pts, size_t npts, ColourDesired fore,
 			  ColourDesired back) {
 	// Allocate memory for the array of points.
 	std::vector<CGPoint> points(npts);
 
-	for (int i = 0; i < npts; i++) {
+	for (size_t i = 0; i < npts; i++) {
 		// Quartz floating point issues: plot the MIDDLE of the pixels
 		points[i].x = pts[i].x + 0.5;
 		points[i].y = pts[i].y + 0.5;
@@ -925,17 +925,6 @@ XYPOSITION SurfaceImpl::WidthText(Font &font_, const char *s, int len) {
 	return 1;
 }
 
-XYPOSITION SurfaceImpl::WidthChar(Font &font_, char ch) {
-	char str[2] = { ch, '\0' };
-	if (font_.GetID()) {
-		CFStringEncoding encoding = EncodingFromCharacterSet(unicodeMode, FontCharacterSet(font_));
-		textLayout->setText(str, 1, encoding, *TextStyleFromFont(font_));
-
-		return textLayout->MeasureStringWidth();
-	} else
-		return 1;
-}
-
 // This string contains a good range of characters to test for size.
 const char sizeString[] = "`~!@#$%^&*()-_=+\\|[]{};:\"\'<,>.?/1234567890"
 			  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";