Backport: Modernize Platform.h (3) - update Surface to delete WidthChar, use size_t for Polygon and delete the standard copy and assignment methods.

Backport of changeset 6940:89fd29243232.

2 files changed, 3 insertions, 17 deletions

diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h
index 843128a6c..00b4ce2ae 100644
--- a/cocoa/PlatCocoa.h
+++ b/cocoa/PlatCocoa.h
@@ -89,7 +89,7 @@ public:
   int DeviceHeightFont(int points) override;
   void MoveTo(int x_, int y_) override;
   void LineTo(int x_, int y_) override;
-  void Polygon(Scintilla::Point *pts, int npts, ColourDesired fore, ColourDesired back) override;
+  void Polygon(Scintilla::Point *pts, size_t npts, ColourDesired fore, ColourDesired back) override;
   void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back) override;
   void FillRectangle(PRectangle rc, ColourDesired back) override;
   void FillRectangle(PRectangle rc, Surface &surfacePattern) override;
@@ -106,7 +106,6 @@ public:
   void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore) override;
   void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions) override;
   XYPOSITION WidthText(Font &font_, const char *s, int len) override;
-  XYPOSITION WidthChar(Font &font_, char ch) override;
   XYPOSITION Ascent(Font &font_) override;
   XYPOSITION Descent(Font &font_) override;
   XYPOSITION InternalLeading(Font &font_) override;
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 405cdee8e..fe1873ffa 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -405,13 +405,13 @@ 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;
@@ -984,19 +984,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";