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, 4 insertions, 4 deletions

diff --git a/cocoa/QuartzTextStyle.h b/cocoa/QuartzTextStyle.h
index f8d50ebe9..b86bb8636 100644
--- a/cocoa/QuartzTextStyle.h
+++ b/cocoa/QuartzTextStyle.h
@@ -18,7 +18,7 @@ public:
 						      &kCFTypeDictionaryKeyCallBacks,
 						      &kCFTypeDictionaryValueCallBacks);
 
-		characterSet = 0;
+		characterSet = Scintilla::CharacterSet::Ansi;
 	}
 
 	QuartzTextStyle(const QuartzTextStyle *other) {
@@ -63,7 +63,7 @@ public:
 		return static_cast<float>(::CTFontGetLeading(fontRef));
 	}
 
-	void setFontRef(CTFontRef inRef, int characterSet_) {
+	void setFontRef(CTFontRef inRef, Scintilla::CharacterSet characterSet_) {
 		fontRef = inRef;
 		characterSet = characterSet_;
 
@@ -81,14 +81,14 @@ public:
 		return fontRef;
 	}
 
-	int getCharacterSet() const noexcept {
+	Scintilla::CharacterSet getCharacterSet() const noexcept {
 		return characterSet;
 	}
 
 private:
 	CFMutableDictionaryRef styleDict;
 	CTFontRef fontRef;
-	int characterSet;
+	Scintilla::CharacterSet characterSet;
 };
 
 #endif