Compilation fixes for wxUSE_STL == 1 and for wxUSE_UNICODE == 1.

[wxWidgets.git] / contrib / src / stc / scintilla / include / KeyWords.h

diff --git a/contrib/src/stc/scintilla/include/KeyWords.h b/contrib/src/stc/scintilla/include/KeyWords.h
index fa427ff2eb0694ed3304bb47cc41ea05d4ec1606..df4e870c580f507203f57f61f2cc58a7af04a2fe 100644 (file)
--- a/contrib/src/stc/scintilla/include/KeyWords.h
+++ b/contrib/src/stc/scintilla/include/KeyWords.h
@@ -19,15 +19,22 @@ protected:
        int language;
        LexerFunction fnLexer;
        LexerFunction fnFolder;
-       
+       const char * const * wordListDescriptions;
+
        static const LexerModule *base;
        static int nextLanguage;
 
 public:
        const char *languageName;
        LexerModule(int language_, LexerFunction fnLexer_, 
-               const char *languageName_=0, LexerFunction fnFolder_=0);
+               const char *languageName_=0, LexerFunction fnFolder_=0,
+               const char * const wordListDescriptions_[] = NULL);
        int GetLanguage() const { return language; }
+
+       // -1 is returned if no WordList information is available
+       int GetNumWordLists() const;
+       const char *GetWordListDescription(int index) const;
+
        virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
                   WordList *keywordlists[], Accessor &styler) const;
        virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,