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, 5 insertions, 6 deletions

diff --git a/src/EditModel.h b/src/EditModel.h
index e2f3e20e0..16a3d1c9f 100644
--- a/src/EditModel.h
+++ b/src/EditModel.h
@@ -8,7 +8,7 @@
 #ifndef EDITMODEL_H
 #define EDITMODEL_H
 
-namespace Scintilla {
+namespace Scintilla::Internal {
 
 /**
 */
@@ -37,12 +37,11 @@ public:
 	Selection sel;
 	bool primarySelection;
 
-	enum class IMEInteraction { windowed, internal } imeInteraction;
-	enum class CharacterSource { directInput, tentativeInput, imeResult };
-	enum class Bidirectional { bidiDisabled, bidiL2R, bidiR2L  } bidirectional;
+	Scintilla::IMEInteraction imeInteraction;
+	Scintilla::Bidirectional bidirectional;
 
-	int foldFlags;
-	int foldDisplayTextStyle;
+	Scintilla::FoldFlag foldFlags;
+	Scintilla::FoldDisplayTextStyle foldDisplayTextStyle;
 	UniqueString defaultFoldDisplayText;
 	std::unique_ptr<IContractionState> pcs;
 	// Hotspot support