X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/591d01bebacf365a654a9061cddeb7fae617a2f5..d77d8c0719173311669c52b96aa5a35023a827d0:/src/stc/scintilla/include/PropSet.h

diff --git a/src/stc/scintilla/include/PropSet.h b/src/stc/scintilla/include/PropSet.h
index 0b4c2f58de..e38de7dc40 100644
--- 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;
+	static bool caseSensitiveFilenames;
 	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);
+
 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);
@@ -56,9 +59,12 @@ public:
 	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	
+	// copy-value semantics not implemented
 	PropSet(const PropSet &copy);
 	void operator=(const PropSet &assign);
 };
@@ -74,9 +80,11 @@ public:
 	int len;
 	bool onlyLineEnds;	///< Delimited by any white space or only line ends
 	bool sorted;
+	bool sortedNoCase;
 	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]; }
@@ -85,9 +93,10 @@ public:
 	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);
-	char *GetNearestWords(const char *wordStart, int searchLen=-1,
+	char *GetNearestWords(const char *wordStart, int searchLen,
 		bool ignoreCase=false, char otherSeparator='\0', bool exactLen=false);
 };