mdi fix

[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 62cd5da3a93620d26ea1d84515011dd8b0643270..e38de7dc408f106970257fff1feafcf300655b12 100644 (file)
--- a/src/stc/scintilla/include/PropSet.h
+++ b/src/stc/scintilla/include/PropSet.h
@@ -29,6 +29,7 @@ protected:
        Property *props[hashRoots];
        Property *enumnext;
        int enumhash;
        Property *props[hashRoots];
        Property *enumnext;
        int enumhash;

+       static bool caseSensitiveFilenames;

        static unsigned int HashString(const char *s, size_t len) {
                unsigned int ret = 0;
                while (len--) {
        static unsigned int HashString(const char *s, size_t len) {
                unsigned int ret = 0;
                while (len--) {


@@ -39,12 +40,14 @@ protected:
                return ret;
        }
        static bool IncludesVar(const char *value, const char *key);
                return ret;
        }
        static bool IncludesVar(const char *value, const char *key);

+

 public:
        PropSet *superPS;
        PropSet();
        ~PropSet();
        void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1);
        void Set(const char *keyVal);
 public:
        PropSet *superPS;
        PropSet();
        ~PropSet();
        void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1);
        void Set(const char *keyVal);

+       void Unset(const char *key, int lenKey=-1);

        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);


@@ -56,6 +59,14 @@ 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);

+       static void SetCaseSensitiveFilenames(bool caseSensitiveFilenames_) {
+               caseSensitiveFilenames = caseSensitiveFilenames_;
+       }
+
+private:
+       // copy-value semantics not implemented
+       PropSet(const PropSet &copy);
+       void operator=(const PropSet &assign);

 };
 
 /**
 };
 
 /**


@@ -69,9 +80,11 @@ public:
        int len;
        bool onlyLineEnds;      ///< Delimited by any white space or only line ends
        bool sorted;
        int len;
        bool onlyLineEnds;      ///< Delimited by any white space or only line ends
        bool sorted;

+       bool sortedNoCase;

        int starts[256];
        WordList(bool onlyLineEnds_ = false) :
        int starts[256];
        WordList(bool onlyLineEnds_ = false) :

-               words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_), sorted(false) {}
+               words(0), wordsNoCase(0), list(0), len(0), onlyLineEnds(onlyLineEnds_),
+               sorted(false), sortedNoCase(false) {}

        ~WordList() { Clear(); }
        operator bool() { return len ? true : false; }
        char *operator[](int ind) { return words[ind]; }
        ~WordList() { Clear(); }
        operator bool() { return len ? true : false; }
        char *operator[](int ind) { return words[ind]; }


@@ -80,14 +93,22 @@ public:
        char *Allocate(int size);
        void SetFromAllocated();
        bool InList(const char *s);
        char *Allocate(int size);
        void SetFromAllocated();
        bool InList(const char *s);

-       const char *GetNearestWord(const char *wordStart, int searchLen = -1,
+       bool InListAbbreviated(const char *s, const char marker);
+       const char *GetNearestWord(const char *wordStart, int searchLen,

                bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
                bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);

-       char *GetNearestWords(const char *wordStart, int searchLen=-1,
-               bool ignoreCase=false, char otherSeparator='\0');
+       char *GetNearestWords(const char *wordStart, int searchLen,
+               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