External lexer feature added by Simon allows lexers to be housed in DLLs with

a .lexer extension which are automatically loaded at startup.
Minor fix to IME support in ScintillaWin.cxx to deal with current mingw headers.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/DocumentAccessor.h b/src/DocumentAccessor.h
index abbb55f18..48742a9b4 100644
--- a/src/DocumentAccessor.h
+++ b/src/DocumentAccessor.h
@@ -18,6 +18,7 @@ class DocumentAccessor : public Accessor {
 protected:
 	Document *pdoc;
 	PropSet &props;
+	WindowID id;
 	int lenDoc;
 
 	char styleBuf[bufferSize];
@@ -30,8 +31,8 @@ protected:
 	void Fill(int position);
 
 public:
-	DocumentAccessor(Document *pdoc_, PropSet &props_) : 
-		Accessor(), pdoc(pdoc_), props(props_), 
+	DocumentAccessor(Document *pdoc_, PropSet &props_, WindowID id_=0) : 
+		Accessor(), pdoc(pdoc_), props(props_), id(id_),
 		lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
 	}
 	~DocumentAccessor();
@@ -46,6 +47,10 @@ public:
 	int GetPropertyInt(const char *key, int defaultValue=0) { 
 		return props.GetInt(key, defaultValue); 
 	}
+	char *GetProperties() {
+		return props.ToString();
+	}
+	WindowID GetWindow() { return id; }
 
 	void StartAt(unsigned int start, char chMask=31);
 	void SetFlags(char chFlags_, char chWhile_) {chFlags = chFlags_; chWhile = chWhile_; };