Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / regex.h

diff --git a/interface/wx/regex.h b/interface/wx/regex.h
index 6685bd878cb116175dbe8b1d70c5ae5992a6f09f..42f79e508b17b3e663c1e86d0a87db3d0f4886eb 100644 (file)
--- a/interface/wx/regex.h
+++ b/interface/wx/regex.h
@@ -2,8 +2,7 @@
 // Name:        regex.h
 // Purpose:     interface of wxRegEx
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -94,19 +93,19 @@ enum
     @code
     wxString text;
     ...
-    wxRegEx reEmail = wxT("([^@]+)@([[:alnum:].-_].)+([[:alnum:]]+)");
+    wxRegEx reEmail = "([^@]+)@([[:alnum:].-_].)+([[:alnum:]]+)";
     if ( reEmail.Matches(text) )
     {
         wxString text = reEmail.GetMatch(email);
         wxString username = reEmail.GetMatch(email, 1);
-        if ( reEmail.GetMatch(email, 3) == wxT("com") ) // .com TLD?
+        if ( reEmail.GetMatch(email, 3) == "com" ) // .com TLD?
         {
             ...
         }
     }
 
     // or we could do this to hide the email address
-    size_t count = reEmail.ReplaceAll(text, wxT("HIDDEN@\\2\\3"));
+    size_t count = reEmail.ReplaceAll(text, "HIDDEN@\\2\\3");
     printf("text now contains %u hidden addresses", count);
     @endcode
 */
@@ -163,7 +162,7 @@ public:
     wxString  GetMatch(const wxString& text, size_t index = 0) const;
 
     /**
-        Returns the size of the array of matches, i.e. the number of bracketed
+        Returns the size of the array of matches, i.e.\ the number of bracketed
         subexpressions plus one for the expression itself, or 0 on error.
 
         May only be called after successful call to Compile().
@@ -198,7 +197,7 @@ public:
         May only be called after successful call to Compile().
     */
     bool Matches(const wxChar* text, int flags = 0) const;
-    const bool Matches(const wxChar* text, int flags, size_t len) const;
+    bool Matches(const wxChar* text, int flags, size_t len) const;
     //@}
 
     /**
@@ -210,7 +209,7 @@ public:
 
         May only be called after successful call to Compile().
     */
-    const bool Matches(const wxString& text, int flags = 0) const;
+    bool Matches(const wxString& text, int flags = 0) const;
 
     /**
         Replaces the current regular expression in the string pointed to by