removed enum that was causing more problems than it was worth

[wxWidgets.git] / contrib / src / stc / scintilla / include / PropSet.h

diff --git a/contrib/src/stc/scintilla/include/PropSet.h b/contrib/src/stc/scintilla/include/PropSet.h
index 1a7e2f166536cfb248906cd498759354430f5a51..62cd5da3a93620d26ea1d84515011dd8b0643270 100644 (file)
--- a/contrib/src/stc/scintilla/include/PropSet.h
+++ b/contrib/src/stc/scintilla/include/PropSet.h
@@ -24,11 +24,21 @@ struct Property {
 /**
  */
 class PropSet {
-private:
+protected:
        enum { hashRoots=31 };
        Property *props[hashRoots];
        Property *enumnext;
        int enumhash;
+       static unsigned int HashString(const char *s, size_t len) {
+               unsigned int ret = 0;
+               while (len--) {
+                       ret <<= 4;
+                       ret ^= *s;
+                       s++;
+               }
+               return ret;
+       }
+       static bool IncludesVar(const char *value, const char *key);
 public:
        PropSet *superPS;
        PropSet();
@@ -71,7 +81,7 @@ public:
        void SetFromAllocated();
        bool InList(const char *s);
        const char *GetNearestWord(const char *wordStart, int searchLen = -1,
-               bool ignoreCase = false, SString wordCharacters="");
+               bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
        char *GetNearestWords(const char *wordStart, int searchLen=-1,
                bool ignoreCase=false, char otherSeparator='\0');
 };