Define C++ version of the Scintilla API in ScintillaTypes.h, ScintillaMessages.h

and ScintillaStructures.h using scoped enumerations.
Use these headers instead of Scintilla.h internally.
External definitions go in the Scintilla namespace and internal definitio0ns in
Scintilla::Internal.

1 files changed, 48 insertions, 43 deletions

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 1cb4f9f65..aaa8714c4 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -33,6 +33,10 @@
 
 #import <Foundation/NSGeometry.h>
 
+#import "ScintillaTypes.h"
+#import "ScintillaMessages.h"
+#import "ScintillaStructures.h"
+
 #import "Debugging.h"
 #import "Geometry.h"
 #import "Platform.h"
@@ -45,6 +49,7 @@
 #import "PlatCocoa.h"
 
 using namespace Scintilla;
+using namespace Scintilla::Internal;
 
 extern sptr_t scintilla_send_message(void *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam);
 
@@ -53,7 +58,7 @@ extern sptr_t scintilla_send_message(void *sci, unsigned int iMessage, uptr_t wP
 /**
  * Converts a Point as used by Scintilla to a Quartz-style CGPoint.
  */
-inline CGPoint CGPointFromPoint(Scintilla::Point pt) {
+inline CGPoint CGPointFromPoint(Scintilla::Internal::Point pt) {
 	return CGPointMake(pt.x, pt.y);
 }
 
@@ -340,12 +345,12 @@ void GetPositions(CTLineRef line, std::vector<CGFloat> &positions) {
 			 positions.begin(), std::plus<CGFloat>());
 }
 
-const int SupportsCocoa[] = {
-	SC_SUPPORTS_LINE_DRAWS_FINAL,
-	SC_SUPPORTS_PIXEL_DIVISIONS,
-	SC_SUPPORTS_FRACTIONAL_STROKE_WIDTH,
-	SC_SUPPORTS_TRANSLUCENT_STROKE,
-	SC_SUPPORTS_PIXEL_MODIFICATION,
+const Supports SupportsCocoa[] = {
+	Supports::LineDrawsFinal,
+	Supports::PixelDivisions,
+	Supports::FractionalStrokeWidth,
+	Supports::TranslucentStroke,
+	Supports::PixelModification,
 };
 
 }
@@ -487,8 +492,8 @@ void SurfaceImpl::SetMode(SurfaceMode mode_) {
 
 //--------------------------------------------------------------------------------------------------
 
-int SurfaceImpl::Supports(int feature) noexcept {
-	for (const int f : SupportsCocoa) {
+int SurfaceImpl::SupportsFeature(Supports feature) noexcept {
+	for (const Supports f : SupportsCocoa) {
 		if (f == feature)
 			return 1;
 	}
@@ -651,7 +656,7 @@ void SurfaceImpl::PolyLine(const Point *pts, size_t npts, Stroke stroke) {
 
 //--------------------------------------------------------------------------------------------------
 
-void SurfaceImpl::Polygon(const Scintilla::Point *pts, size_t npts, FillStroke fillStroke) {
+void SurfaceImpl::Polygon(const Scintilla::Internal::Point *pts, size_t npts, FillStroke fillStroke) {
 	std::vector<CGPoint> points;
 	std::transform(pts, pts + npts, std::back_inserter(points), CGPointFromPoint);
 
@@ -780,7 +785,7 @@ void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) {
 }
 
 void SurfaceImpl::RoundedRectangle(PRectangle rc, FillStroke fillStroke) {
-	// This is only called from the margin marker drawing code for SC_MARK_ROUNDRECT
+	// This is only called from the margin marker drawing code for MarkerSymbol::RoundRect
 	// The Win32 version does
 	//  ::RoundRect(hdc, rc.left + 1, rc.top, rc.right - 1, rc.bottom, 8, 8 );
 	// which is a rectangle with rounded corners each having a radius of 4 pixels.
@@ -888,7 +893,7 @@ static void DrawChamferedRectangle(CGContextRef gc, PRectangle rc, int cornerSiz
 	CGContextDrawPath(gc, mode);
 }
 
-void Scintilla::SurfaceImpl::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) {
+void Scintilla::Internal::SurfaceImpl::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize, FillStroke fillStroke) {
 	if (gc) {
 		const XYPOSITION halfStroke = fillStroke.stroke.width / 2.0f;
 		// Set the Fill color to match
@@ -937,7 +942,7 @@ void Scintilla::SurfaceImpl::AlphaRectangle(PRectangle rc, XYPOSITION cornerSize
 	}
 }
 
-void Scintilla::SurfaceImpl::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
+void Scintilla::Internal::SurfaceImpl::GradientRectangle(PRectangle rc, const std::vector<ColourStop> &stops, GradientOptions options) {
 	if (!gc) {
 		return;
 	}
@@ -1135,7 +1140,7 @@ void SurfaceImpl::CopyImageRectangle(SurfaceImpl *source, PRectangle srcRect, PR
 	CGImageRelease(image);
 }
 
-void SurfaceImpl::Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource) {
+void SurfaceImpl::Copy(PRectangle rc, Scintilla::Internal::Point from, Surface &surfaceSource) {
 	// Maybe we have to make the Surface two contexts:
 	// a bitmap context which we do all the drawing on, and then a "real" context
 	// which we copy the output to when we call "Synchronize". Ugh! Gross and slow!
@@ -1196,7 +1201,7 @@ void SurfaceImpl::DrawTextClipped(PRectangle rc, const Font *font_, XYPOSITION y
 
 //--------------------------------------------------------------------------------------------------
 
-CFStringEncoding EncodingFromCharacterSet(bool unicode, int characterSet) {
+CFStringEncoding EncodingFromCharacterSet(bool unicode, CharacterSet characterSet) {
 	if (unicode)
 		return kCFStringEncodingUTF8;
 
@@ -1204,47 +1209,47 @@ CFStringEncoding EncodingFromCharacterSet(bool unicode, int characterSet) {
 	enum { notSupported = kCFStringEncodingISOLatin1};
 
 	switch (characterSet) {
-	case SC_CHARSET_ANSI:
+	case CharacterSet::Ansi:
 		return kCFStringEncodingISOLatin1;
-	case SC_CHARSET_DEFAULT:
+	case CharacterSet::Default:
 		return kCFStringEncodingISOLatin1;
-	case SC_CHARSET_BALTIC:
+	case CharacterSet::Baltic:
 		return kCFStringEncodingWindowsBalticRim;
-	case SC_CHARSET_CHINESEBIG5:
+	case CharacterSet::ChineseBig5:
 		return kCFStringEncodingBig5;
-	case SC_CHARSET_EASTEUROPE:
+	case CharacterSet::EastEurope:
 		return kCFStringEncodingWindowsLatin2;
-	case SC_CHARSET_GB2312:
+	case CharacterSet::GB2312:
 		return kCFStringEncodingGB_18030_2000;
-	case SC_CHARSET_GREEK:
+	case CharacterSet::Greek:
 		return kCFStringEncodingWindowsGreek;
-	case SC_CHARSET_HANGUL:
+	case CharacterSet::Hangul:
 		return kCFStringEncodingEUC_KR;
-	case SC_CHARSET_MAC:
+	case CharacterSet::Mac:
 		return kCFStringEncodingMacRoman;
-	case SC_CHARSET_OEM:
+	case CharacterSet::Oem:
 		return kCFStringEncodingISOLatin1;
-	case SC_CHARSET_RUSSIAN:
+	case CharacterSet::Russian:
 		return kCFStringEncodingKOI8_R;
-	case SC_CHARSET_CYRILLIC:
+	case CharacterSet::Cyrillic:
 		return kCFStringEncodingWindowsCyrillic;
-	case SC_CHARSET_SHIFTJIS:
+	case CharacterSet::ShiftJis:
 		return kCFStringEncodingShiftJIS;
-	case SC_CHARSET_SYMBOL:
+	case CharacterSet::Symbol:
 		return kCFStringEncodingMacSymbol;
-	case SC_CHARSET_TURKISH:
+	case CharacterSet::Turkish:
 		return kCFStringEncodingWindowsLatin5;
-	case SC_CHARSET_JOHAB:
+	case CharacterSet::Johab:
 		return kCFStringEncodingWindowsKoreanJohab;
-	case SC_CHARSET_HEBREW:
+	case CharacterSet::Hebrew:
 		return kCFStringEncodingWindowsHebrew;
-	case SC_CHARSET_ARABIC:
+	case CharacterSet::Arabic:
 		return kCFStringEncodingWindowsArabic;
-	case SC_CHARSET_VIETNAMESE:
+	case CharacterSet::Vietnamese:
 		return kCFStringEncodingWindowsVietnamese;
-	case SC_CHARSET_THAI:
+	case CharacterSet::Thai:
 		return kCFStringEncodingISOLatinThai;
-	case SC_CHARSET_8859_15:
+	case CharacterSet::Iso8859_15:
 		return kCFStringEncodingISOLatin1;
 	default:
 		return notSupported;
@@ -1507,7 +1512,7 @@ void SurfaceImpl::FlushCachedState() {
 void SurfaceImpl::FlushDrawing() {
 }
 
-std::unique_ptr<Surface> Surface::Allocate(int) {
+std::unique_ptr<Surface> Surface::Allocate(Technology) {
 	return std::make_unique<SurfaceImpl>();
 }
 
@@ -1711,7 +1716,7 @@ static NSImage *ImageFromXPM(XPM *pxpm) {
 		const int width = pxpm->GetWidth();
 		const int height = pxpm->GetHeight();
 		PRectangle rcxpm(0, 0, width, height);
-		std::unique_ptr<Surface> surfaceBase(Surface::Allocate(SC_TECHNOLOGY_DEFAULT));
+		std::unique_ptr<Surface> surfaceBase(Surface::Allocate(Technology::Default));
 		std::unique_ptr<Surface> surfaceXPM = surfaceBase->AllocatePixMap(width, height);
 		SurfaceImpl *surfaceIXPM = static_cast<SurfaceImpl *>(surfaceXPM.get());
 		CGContextClearRect(surfaceIXPM->GetContext(), CGRectMake(0, 0, width, height));
@@ -1911,7 +1916,7 @@ public:
 
 	// ListBox methods
 	void SetFont(const Font *font_) override;
-	void Create(Window &parent, int ctrlID, Scintilla::Point pt, int lineHeight_, bool unicodeMode_, int technology_) override;
+	void Create(Window &parent, int ctrlID, Scintilla::Internal::Point pt, int lineHeight_, bool unicodeMode_, Technology technology_) override;
 	void SetAverageCharWidth(int width) override;
 	void SetVisibleRows(int rows) override;
 	int GetVisibleRows() const override;
@@ -1944,8 +1949,8 @@ public:
 	void SelectionChange() override;
 };
 
-void ListBoxImpl::Create(Window & /*parent*/, int /*ctrlID*/, Scintilla::Point pt,
-			 int lineHeight_, bool unicodeMode_, int) {
+void ListBoxImpl::Create(Window & /*parent*/, int /*ctrlID*/, Scintilla::Internal::Point pt,
+			 int lineHeight_, bool unicodeMode_, Technology) {
 	lineHeight = lineHeight_;
 	unicodeMode = unicodeMode_;
 	maxWidth = 2000;
@@ -2077,7 +2082,7 @@ void ListBoxImpl::Append(char *s, int type) {
 	int count = Length();
 	ld.Add(count, type, s);
 
-	Scintilla::SurfaceImpl surface;
+	Scintilla::Internal::SurfaceImpl surface;
 	XYPOSITION width = surface.WidthText(font.get(), s);
 	if (width > maxItemWidth) {
 		maxItemWidth = width;
@@ -2252,7 +2257,7 @@ NSMenu
 
 //--------------------------------------------------------------------------------------------------
 
-- (void) setOwner: (Scintilla::ScintillaCocoa *) newOwner {
+- (void) setOwner: (Scintilla::Internal::ScintillaCocoa *) newOwner {
 	owner = newOwner;
 }