Fix for crash when the child has no menu

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

diff --git a/src/stc/scintilla/include/PropSet.h b/src/stc/scintilla/include/PropSet.h
index 3f1b64f77fc89ea026e39a9730cfc157e441c6e2..0b4c2f58de2046a4a95d06e9769ff79cae2f187d 100644 (file)
--- a/src/stc/scintilla/include/PropSet.h
+++ b/src/stc/scintilla/include/PropSet.h
@@ -24,11 +24,21 @@ struct Property {
 /**
  */
 class PropSet {
 /**
  */
 class PropSet {

-private:
+protected:

        enum { hashRoots=31 };
        Property *props[hashRoots];
        Property *enumnext;
        int enumhash;
        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();
 public:
        PropSet *superPS;
        PropSet();


@@ -38,7 +48,7 @@ public:
        void SetMultiple(const char *s);
        SString Get(const char *key);
        SString GetExpanded(const char *key);
        void SetMultiple(const char *s);
        SString Get(const char *key);
        SString GetExpanded(const char *key);

-       SString Expand(const char *withVars);
+       SString Expand(const char *withVars, int maxExpands=100);

        int GetInt(const char *key, int defaultValue=0);
        SString GetWild(const char *keybase, const char *filename);
        SString GetNewExpand(const char *keybase, const char *filename="");
        int GetInt(const char *key, int defaultValue=0);
        SString GetWild(const char *keybase, const char *filename);
        SString GetNewExpand(const char *keybase, const char *filename="");


@@ -46,6 +56,11 @@ public:
        char *ToString();       // Caller must delete[] the return value
        bool GetFirst(char **key, char **val);
        bool GetNext(char **key, char **val);
        char *ToString();       // Caller must delete[] the return value
        bool GetFirst(char **key, char **val);
        bool GetNext(char **key, char **val);

+
+private:
+       // copy-value semantics not implemented 
+       PropSet(const PropSet &copy);
+       void operator=(const PropSet &assign);

 };
 
 /**
 };
 
 /**


@@ -71,13 +86,20 @@ public:
        void SetFromAllocated();
        bool InList(const char *s);
        const char *GetNearestWord(const char *wordStart, int searchLen = -1,
        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,
        char *GetNearestWords(const char *wordStart, int searchLen=-1,

-               bool ignoreCase=false, char otherSeparator='\0');
+               bool ignoreCase=false, char otherSeparator='\0', bool exactLen=false);

 };
 
 inline bool IsAlphabetic(unsigned int ch) {
        return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
 }
 
 };
 
 inline bool IsAlphabetic(unsigned int ch) {
        return ((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z'));
 }
 

+
+#ifdef _MSC_VER
+// Visual C++ doesn't like the private copy idiom for disabling
+// the default copy constructor and operator=, but it's fine.
+#pragma warning(disable: 4511 4512)
+#endif
+

 #endif
 #endif