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 ca4695355fac0eb7261fed7a64c3fb9f700ae74f..6ea23ab5a3718bb1632182d5e0a4f96233c679f8 100644 (file)
--- a/contrib/src/stc/scintilla/src/ScintillaBase.h
+++ b/contrib/src/stc/scintilla/src/ScintillaBase.h
@@ -2,7 +2,7 @@
 /** @file ScintillaBase.h
  ** Defines an enhanced subclass of Editor with calltips, autocomplete and context menu.
  **/
-// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2002 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef SCINTILLABASE_H
@@ -20,7 +20,7 @@ protected:
        enum {
                idCallTip=1,
                idAutoComplete=2,
-               
+
                idcmdUndo=10,
                idcmdRedo=11,
                idcmdCut=12,
@@ -38,12 +38,12 @@ protected:
 
        int listType;                   ///< 0 is an autocomplete list
        SString userListSelected;       ///< Receives listbox selected string
-       
+
 #ifdef SCI_LEXER
        int lexLanguage;
-       LexerModule *lexCurrent;
+       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);
@@ -56,24 +56,29 @@ protected:
        virtual void Finalise() = 0;
 
        virtual void RefreshColourPalette(Palette &pal, bool want);
-       
-       virtual void AddCharUTF(char *s, unsigned int len);
+
+       virtual void AddCharUTF(char *s, unsigned int len, bool treatAsDBCS=false);
        void Command(int cmdId);
        virtual void CancelModes();
        virtual int KeyCommand(unsigned int iMessage);
-       
+
        void AutoCompleteStart(int lenEntered, const char *list);
        void AutoCompleteCancel();
        void AutoCompleteMove(int delta);
-       void AutoCompleteChanged(char ch=0);
-       void AutoCompleteCompleted(char fillUp='\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;
        void ContextMenu(Point pt);
-       
+
        virtual void ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, bool alt);
 
        virtual void NotifyStyleToNeeded(int endStyleNeeded);