Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from Neil H.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-02-07 23:15:28 +00:00
parent 574c939ef1
commit 177b62bf4d
2 changed files with 58 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/src/stc/scintilla/src/PropSet.cxx
View File

@@ -34,16 +34,11 @@ static inline bool IsLetter(char ch) {
int CompareCaseInsensitive(const char *a, const char *b) { int CompareCaseInsensitive(const char *a, const char *b) {
while (*a && *b) { while (*a && *b) {
if (*a != *b) { if (*a != *b) {
if (IsLetter(*a) && IsLetter(*b)) {
char upperA = MakeUpperCase(*a); char upperA = MakeUpperCase(*a);
char upperB = MakeUpperCase(*b); char upperB = MakeUpperCase(*b);
if (upperA != upperB) if (upperA != upperB)
return upperA - upperB; return upperA - upperB;
} }
else {
return *a - *b;
}
}
a++; a++;
b++; b++;
} }
@@ -54,16 +49,11 @@ int CompareCaseInsensitive(const char *a, const char *b) {
int CompareNCaseInsensitive(const char *a, const char *b, int len) { int CompareNCaseInsensitive(const char *a, const char *b, int len) {
while (*a && *b && len) { while (*a && *b && len) {
if (*a != *b) { if (*a != *b) {
if (IsLetter(*a) && IsLetter(*b)) {
char upperA = MakeUpperCase(*a); char upperA = MakeUpperCase(*a);
char upperB = MakeUpperCase(*b); char upperB = MakeUpperCase(*b);
if (upperA != upperB) if (upperA != upperB)
return upperA - upperB; return upperA - upperB;
} }
else {
return *a - *b;
}
}
a++; a++;
b++; b++;
len--; len--;
@@ -75,6 +65,7 @@ int CompareNCaseInsensitive(const char *a, const char *b, int len) {
return *a - *b; return *a - *b;
} }
bool EqualCaseInsensitive(const char *a, const char *b) { bool EqualCaseInsensitive(const char *a, const char *b) {
return 0 == CompareCaseInsensitive(a, b); return 0 == CompareCaseInsensitive(a, b);
} }

11
src/stc/scintilla/src/PropSet.cxx
View File

@@ -34,16 +34,11 @@ static inline bool IsLetter(char ch) {
int CompareCaseInsensitive(const char *a, const char *b) { int CompareCaseInsensitive(const char *a, const char *b) {
while (*a && *b) { while (*a && *b) {
if (*a != *b) { if (*a != *b) {
if (IsLetter(*a) && IsLetter(*b)) {
char upperA = MakeUpperCase(*a); char upperA = MakeUpperCase(*a);
char upperB = MakeUpperCase(*b); char upperB = MakeUpperCase(*b);
if (upperA != upperB) if (upperA != upperB)
return upperA - upperB; return upperA - upperB;
} }
else {
return *a - *b;
}
}
a++; a++;
b++; b++;
} }
@@ -54,16 +49,11 @@ int CompareCaseInsensitive(const char *a, const char *b) {
int CompareNCaseInsensitive(const char *a, const char *b, int len) { int CompareNCaseInsensitive(const char *a, const char *b, int len) {
while (*a && *b && len) { while (*a && *b && len) {
if (*a != *b) { if (*a != *b) {
if (IsLetter(*a) && IsLetter(*b)) {
char upperA = MakeUpperCase(*a); char upperA = MakeUpperCase(*a);
char upperB = MakeUpperCase(*b); char upperB = MakeUpperCase(*b);
if (upperA != upperB) if (upperA != upperB)
return upperA - upperB; return upperA - upperB;
} }
else {
return *a - *b;
}
}
a++; a++;
b++; b++;
len--; len--;
@@ -75,6 +65,7 @@ int CompareNCaseInsensitive(const char *a, const char *b, int len) {
return *a - *b; return *a - *b;
} }
bool EqualCaseInsensitive(const char *a, const char *b) { bool EqualCaseInsensitive(const char *a, const char *b) {
return 0 == CompareCaseInsensitive(a, b); return 0 == CompareCaseInsensitive(a, b);
} }