Added Upper() and Lower() - return the copy of the string converted to upper

or lower case (unlike MakeXXX() counterparts which change the string itself)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 1073bbcfe84bec114419cb4186d4809f0b8aa2b9..f3c3c00111688359782645dd7853d200b73e9866 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -403,7 +403,7 @@ public:
   wxString& operator<<(float f);
       // insert a double into string
   wxString& operator<<(double d);
   wxString& operator<<(float f);
       // insert a double into string
   wxString& operator<<(double d);

-  
+

   // string comparison
     // case-sensitive comparison: return 0 if =, +1 if > or -1 if <
   int  Cmp(const char *psz) const { return strcmp(c_str(), psz); }
   // string comparison
     // case-sensitive comparison: return 0 if =, +1 if > or -1 if <
   int  Cmp(const char *psz) const { return strcmp(c_str(), psz); }


@@ -441,14 +441,18 @@ public:
   wxString AfterLast(char ch) const;
 
     // for compatibility only, use more explicitly named functions above
   wxString AfterLast(char ch) const;
 
     // for compatibility only, use more explicitly named functions above

-  wxString Before(char ch) const { return BeforeLast(ch); } 
-  wxString After(char ch) const { return AfterFirst(ch); } 
+  wxString Before(char ch) const { return BeforeLast(ch); }
+  wxString After(char ch) const { return AfterFirst(ch); }

 
   // case conversion
 
   // case conversion

-      // convert to upper case, return the string itself
+      // convert to upper case in place, return the string itself

   wxString& MakeUpper();
   wxString& MakeUpper();

-      // convert to lower case, return the string itself
+      // convert to upper case, return the copy of the string
+  wxString Upper() const { wxString s(*this); return s.MakeUpper(); }
+      // convert to lower case in place, return the string itself

   wxString& MakeLower();
   wxString& MakeLower();

+      // convert to lower case, return the copy of the string
+  wxString Lower() const { wxString s(*this); return s.MakeLower(); }

 
   // trimming/padding whitespace (either side) and truncating
       // remove spaces from left or from right (default) side
 
   // trimming/padding whitespace (either side) and truncating
       // remove spaces from left or from right (default) side