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

diff --git a/src/EditModel.cxx b/src/EditModel.cxx
index 35a2bc549..e9186a026 100644
--- a/src/EditModel.cxx
+++ b/src/EditModel.cxx
@@ -21,14 +21,14 @@
 #include <algorithm>
 #include <memory>
 
+#include "ScintillaTypes.h"
+#include "ILoader.h"
+#include "ILexer.h"
+
 #include "Debugging.h"
 #include "Geometry.h"
 #include "Platform.h"
 
-#include "ILoader.h"
-#include "ILexer.h"
-#include "Scintilla.h"
-
 #include "CharacterCategoryMap.h"
 
 #include "Position.h"
@@ -38,7 +38,6 @@
 #include "RunStyles.h"
 #include "ContractionState.h"
 #include "CellBuffer.h"
-#include "KeyMap.h"
 #include "Indicator.h"
 #include "LineMarker.h"
 #include "Style.h"
@@ -53,6 +52,7 @@
 #include "EditModel.h"
 
 using namespace Scintilla;
+using namespace Scintilla::Internal;
 
 Caret::Caret() noexcept :
 	active(false), on(false), period(500) {}
@@ -64,19 +64,19 @@ EditModel::EditModel() : braces{} {
 	posDrag = SelectionPosition(Sci::invalidPosition);
 	braces[0] = Sci::invalidPosition;
 	braces[1] = Sci::invalidPosition;
-	bracesMatchStyle = STYLE_BRACEBAD;
+	bracesMatchStyle = StyleBraceBad;
 	highlightGuideColumn = 0;
 	hasFocus = false;
 	primarySelection = true;
-	imeInteraction = IMEInteraction::windowed;
-	bidirectional = Bidirectional::bidiDisabled;
-	foldFlags = 0;
-	foldDisplayTextStyle = SC_FOLDDISPLAYTEXT_HIDDEN;
+	imeInteraction = IMEInteraction::Windowed;
+	bidirectional = Bidirectional::Disabled;
+	foldFlags = FoldFlag::None;
+	foldDisplayTextStyle = FoldDisplayTextStyle::Hidden;
 	hotspot = Range(Sci::invalidPosition);
 	hotspotSingleLine = true;
 	hoverIndicatorPos = Sci::invalidPosition;
 	wrapWidth = LineLayout::wrapWidthInfinite;
-	pdoc = new Document(SC_DOCUMENTOPTION_DEFAULT);
+	pdoc = new Document(DocumentOption::Default);
 	pdoc->AddRef();
 	pcs = ContractionStateCreate(pdoc->IsLarge());
 }
@@ -87,12 +87,12 @@ EditModel::~EditModel() {
 }
 
 bool EditModel::BidirectionalEnabled() const noexcept {
-	return (bidirectional != Bidirectional::bidiDisabled) &&
-		(SC_CP_UTF8 == pdoc->dbcsCodePage);
+	return (bidirectional != Bidirectional::Disabled) &&
+		(CpUtf8 == pdoc->dbcsCodePage);
 }
 
 bool EditModel::BidirectionalR2L() const noexcept {
-	return bidirectional == Bidirectional::bidiR2L;
+	return bidirectional == Bidirectional::R2L;
 }
 
 void EditModel::SetDefaultFoldDisplayText(const char *text) {
@@ -104,7 +104,7 @@ const char *EditModel::GetDefaultFoldDisplayText() const noexcept {
 }
 
 const char *EditModel::GetFoldDisplayText(Sci::Line lineDoc) const noexcept {
-	if (foldDisplayTextStyle == SC_FOLDDISPLAYTEXT_HIDDEN || pcs->GetExpanded(lineDoc)) {
+	if (foldDisplayTextStyle == FoldDisplayTextStyle::Hidden || pcs->GetExpanded(lineDoc)) {
 		return nullptr;
 	}