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

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

diff --git a/contrib/src/stc/scintilla/src/DocumentAccessor.h b/contrib/src/stc/scintilla/src/DocumentAccessor.h
index 48742a9b40564e3a1a7093a4ab889a458c14cedf..dc591d13ec3142c08216f5451b18e752db0fb6e1 100644 (file)
--- a/contrib/src/stc/scintilla/src/DocumentAccessor.h
+++ b/contrib/src/stc/scintilla/src/DocumentAccessor.h
@@ -26,6 +26,7 @@ protected:
        char chFlags;
        char chWhile;
        unsigned int startSeg;
        char chFlags;
        char chWhile;
        unsigned int startSeg;

+       int startPosStyling;

 
        bool InternalIsLeadByte(char ch);
        void Fill(int position);
 
        bool InternalIsLeadByte(char ch);
        void Fill(int position);


@@ -33,9 +34,11 @@ protected:
 public:
        DocumentAccessor(Document *pdoc_, PropSet &props_, WindowID id_=0) : 
                Accessor(), pdoc(pdoc_), props(props_), id(id_),
 public:
        DocumentAccessor(Document *pdoc_, PropSet &props_, WindowID id_=0) : 
                Accessor(), pdoc(pdoc_), props(props_), id(id_),

-               lenDoc(-1), validLen(0), chFlags(0), chWhile(0) {
+               lenDoc(-1), validLen(0), chFlags(0), chWhile(0), 
+               startSeg(0), startPosStyling(0) {

        }
        ~DocumentAccessor();
        }
        ~DocumentAccessor();

+       bool Match(int pos, const char *s);

        char StyleAt(int position);
        int GetLine(int position);
        int LineStart(int line);
        char StyleAt(int position);
        int GetLine(int position);
        int LineStart(int line);