Merge Ilexer and ILexerWithSubStyles into ILexer4 to avoid need for version

checking in 4.0. Use lvRelease4 ID.

1 files changed, 2 insertions, 6 deletions

diff --git a/include/ILexer.h b/include/ILexer.h
index d18b307d1..7f92e2b79 100644
--- a/include/ILexer.h
+++ b/include/ILexer.h
@@ -50,9 +50,9 @@ public:
 	virtual int SCI_METHOD GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const = 0;
 };
 
-enum { lvOriginal=0, lvSubStyles=1 };
+enum { lvRelease4=2 };
 
-class ILexer {
+class ILexer4 {
 public:
 	virtual int SCI_METHOD Version() const = 0;
 	virtual void SCI_METHOD Release() = 0;
@@ -65,10 +65,6 @@ public:
 	virtual void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) = 0;
 	virtual void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position lengthDoc, int initStyle, IDocument *pAccess) = 0;
 	virtual void * SCI_METHOD PrivateCall(int operation, void *pointer) = 0;
-};
-
-class ILexerWithSubStyles : public ILexer {
-public:
 	virtual int SCI_METHOD LineEndTypesSupported() = 0;
 	virtual int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) = 0;
 	virtual int SCI_METHOD SubStylesStart(int styleBase) = 0;