update scintilla to v3.30 9f249e248e4268d124692485a759a0881b756b9a

1 files changed, 10 insertions, 3 deletions

diff --git a/scintilla/src/Document.h b/scintilla/src/Document.h
index 1125c8a..1c6a02a 100644
--- a/scintilla/src/Document.h
+++ b/scintilla/src/Document.h
@@ -186,6 +186,7 @@ public:
 	virtual ~LexInterface() {

 	}

 	void Colourise(int start, int end);

+	int LineEndTypesSupported();

 	bool UseContainerLexing() const {

 		return instance == 0;

 	}

@@ -193,7 +194,7 @@ public:
 

 /**

  */

-class Document : PerLine, public IDocument, public ILoader {

+class Document : PerLine, public IDocumentWithLineEnd, public ILoader {

 

 public:

 	/** Used to pair watcher pointer with user data. */

@@ -240,6 +241,7 @@ public:
 	int eolMode;

 	/// Can also be SC_CP_UTF8 to enable UTF-8 mode

 	int dbcsCodePage;

+	int lineEndBitSet;

 	int tabInChars;

 	int indentInChars;

 	int actualIndentInChars;

@@ -256,12 +258,16 @@ public:
 	int SCI_METHOD Release();

 

 	virtual void Init();

+	int LineEndTypesSupported() const;

 	bool SetDBCSCodePage(int dbcsCodePage_);

+	int GetLineEndTypesAllowed() { return cb.GetLineEndTypes(); }

+	bool SetLineEndTypesAllowed(int lineEndBitSet_);

+	int GetLineEndTypesActive() { return cb.GetLineEndTypes(); }

 	virtual void InsertLine(int line);

 	virtual void RemoveLine(int line);

 

 	int SCI_METHOD Version() const {

-		return dvOriginal;

+		return dvLineEnd;

 	}

 

 	void SCI_METHOD SetErrorStatus(int status);

@@ -338,9 +344,10 @@ public:
 	void DeleteAllMarks(int markerNum);

 	int LineFromHandle(int markerHandle);

 	int SCI_METHOD LineStart(int line) const;

-	int LineEnd(int line) const;

+	int SCI_METHOD LineEnd(int line) const;

 	int LineEndPosition(int position) const;

 	bool IsLineEndPosition(int position) const;

+	bool IsPositionInLineEnd(int position) const;

 	int VCHomePosition(int position) const;

 

 	int SCI_METHOD SetLevel(int line, int level);