Don't set the longhelp in the statusbar if there isn't one.

[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 869b59d2674a4a3226885fb1738d6e683407ef64..fa427ff2eb0694ed3304bb47cc41ea05d4ec1606 100644 (file)
--- a/contrib/src/stc/scintilla/include/KeyWords.h
+++ b/contrib/src/stc/scintilla/include/KeyWords.h
@@ -15,25 +15,25 @@ typedef void (*LexerFunction)(unsigned int startPos, int lengthDoc, int initStyl
  */
 class LexerModule {
 protected:
  */
 class LexerModule {
 protected:

-       LexerModule *next;
+       const LexerModule *next;

        int language;
        int language;

-       const char *languageName;

        LexerFunction fnLexer;
        LexerFunction fnFolder;
        
        LexerFunction fnLexer;
        LexerFunction fnFolder;
        

-       static LexerModule *base;
+       static const LexerModule *base;

        static int nextLanguage;
 
 public:
        static int nextLanguage;
 
 public:

+       const char *languageName;

        LexerModule(int language_, LexerFunction fnLexer_, 
                const char *languageName_=0, LexerFunction fnFolder_=0);
        LexerModule(int language_, LexerFunction fnLexer_, 
                const char *languageName_=0, LexerFunction fnFolder_=0);

-       int GetLanguage() { return language; }
+       int GetLanguage() const { return language; }

        virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
        virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,

-                  WordList *keywordlists[], Accessor &styler);
+                  WordList *keywordlists[], Accessor &styler) const;

        virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
        virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,

-                  WordList *keywordlists[], Accessor &styler);
-       static LexerModule *Find(int language);
-       static LexerModule *Find(const char *languageName);
+                  WordList *keywordlists[], Accessor &styler) const;
+       static const LexerModule *Find(int language);
+       static const LexerModule *Find(const char *languageName);

 };
 
 /**
 };
 
 /**