Patch #1106564, corrects possible 100% CPU load condition.

[wxWidgets.git] / contrib / src / stc / scintilla / src / ScintillaBase.h

diff --git a/contrib/src/stc/scintilla/src/ScintillaBase.h b/contrib/src/stc/scintilla/src/ScintillaBase.h
index 28c089edd2563e9a36cd4dcaf97d66ead96d41b5..6ea23ab5a3718bb1632182d5e0a4f96233c679f8 100644 (file)
--- a/contrib/src/stc/scintilla/src/ScintillaBase.h
+++ b/contrib/src/stc/scintilla/src/ScintillaBase.h
@@ -43,7 +43,7 @@ protected:
        int lexLanguage;
        const LexerModule *lexCurrent;
        PropSet props;
-       enum {numWordLists=6};
+       enum {numWordLists=KEYWORDSET_MAX+1};
        WordList *keyWordLists[numWordLists+1];
        void SetLexer(uptr_t wParam);
        void SetLexerLanguage(const char *languageName);
@@ -65,11 +65,15 @@ protected:
        void AutoCompleteStart(int lenEntered, const char *list);
        void AutoCompleteCancel();
        void AutoCompleteMove(int delta);
-       void AutoCompleteChanged(char ch=0);
+       int AutoCompleteGetCurrent();
+       void AutoCompleteCharacterAdded(char ch);
+       void AutoCompleteCharacterDeleted();
        void AutoCompleteCompleted();
        void AutoCompleteMoveToCurrentWord();
        static void AutoCompleteDoubleClick(void* p);
 
+       void CallTipClick();
+       void CallTipShow(Point pt, const char *defn);
        virtual void CreateCallTipWindow(PRectangle rc) = 0;
 
        virtual void AddToPopUp(const char *label, int cmd=0, bool enabled=true) = 0;