To -> From

[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 df4e870c580f507203f57f61f2cc58a7af04a2fe..059ac0da0fd881dbe31aebe03c584cb368837f39 100644 (file)
--- a/contrib/src/stc/scintilla/include/KeyWords.h
+++ b/contrib/src/stc/scintilla/include/KeyWords.h
@@ -20,21 +20,29 @@ protected:
        LexerFunction fnLexer;
        LexerFunction fnFolder;
        const char * const * wordListDescriptions;
        LexerFunction fnLexer;
        LexerFunction fnFolder;
        const char * const * wordListDescriptions;

+       int styleBits;

 
        static const LexerModule *base;
        static int nextLanguage;
 
 public:
        const char *languageName;
 
        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 * const wordListDescriptions_[] = NULL);
+       LexerModule(int language_, 
+               LexerFunction fnLexer_, 
+               const char *languageName_=0, 
+               LexerFunction fnFolder_=0,
+               const char * const wordListDescriptions_[] = NULL,
+               int styleBits_=5);
+       virtual ~LexerModule() {
+       }

        int GetLanguage() const { return language; }
 
        // -1 is returned if no WordList information is available
        int GetNumWordLists() const;
        const char *GetWordListDescription(int index) const;
 
        int GetLanguage() const { return language; }
 
        // -1 is returned if no WordList information is available
        int GetNumWordLists() const;
        const char *GetWordListDescription(int index) const;
 

+       int GetStyleBitsNeeded() 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,
        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,