correction to last commit: Korean and Romanian translations will only be in 2.9.1...

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

diff --git a/src/stc/scintilla/include/SString.h b/src/stc/scintilla/include/SString.h
index 5c2a93d33b7737cb1a28c3b3bbe8680f5bf35409..b770afebeedfaa6e896f3df0b5464c475f562b51 100644 (file)
--- a/src/stc/scintilla/include/SString.h
+++ b/src/stc/scintilla/include/SString.h
@@ -8,11 +8,16 @@
 #ifndef SSTRING_H
 #define SSTRING_H
 
 #ifndef SSTRING_H
 #define SSTRING_H
 

+

 // These functions are implemented because each platform calls them something different.
 int CompareCaseInsensitive(const char *a, const char *b);
 int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
 bool EqualCaseInsensitive(const char *a, const char *b);
 
 // These functions are implemented because each platform calls them something different.
 int CompareCaseInsensitive(const char *a, const char *b);
 int CompareNCaseInsensitive(const char *a, const char *b, size_t len);
 bool EqualCaseInsensitive(const char *a, const char *b);
 

+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#endif
+

 // Define another string class.
 // While it would be 'better' to use std::string, that doubles the executable size.
 // An SString may contain embedded nul characters.
 // Define another string class.
 // While it would be 'better' to use std::string, that doubles the executable size.
 // An SString may contain embedded nul characters.


@@ -197,7 +202,7 @@ public:
        bool operator!=(const char *sOther) const {
                return !operator==(sOther);
        }
        bool operator!=(const char *sOther) const {
                return !operator==(sOther);
        }

-       bool contains(char ch) {
+       bool contains(char ch) const {

                return (s && *s) ? strchr(s, ch) != 0 : false;
        }
        void setsizegrowth(lenpos_t sizeGrowth_) {
                return (s && *s) ? strchr(s, ch) != 0 : false;
        }
        void setsizegrowth(lenpos_t sizeGrowth_) {


@@ -253,7 +258,7 @@ public:
        bool startswith(const char *prefix);
        bool endswith(const char *suffix);
        int search(const char *sFind, lenpos_t start=0) const;
        bool startswith(const char *prefix);
        bool endswith(const char *suffix);
        int search(const char *sFind, lenpos_t start=0) const;

-       bool contains(const char *sFind) {
+       bool contains(const char *sFind) const {

                return search(sFind) >= 0;
        }
        int substitute(char chFind, char chReplace);
                return search(sFind) >= 0;
        }
        int substitute(char chFind, char chReplace);


@@ -277,4 +282,8 @@ inline char *StringDup(
        return SContainer::StringAllocate(s, len);
 }
 
        return SContainer::StringAllocate(s, len);
 }
 

+#ifdef SCI_NAMESPACE
+}
+#endif
+

 #endif
 #endif