added test for writing empty value to the config

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 70443b2964cd853b0b074c9e58c8503b08dabf03..8fb775da6d1a397972cd3ebb54c62cefc0b33948 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -20,6 +20,8 @@
 
 #if wxUSE_REGEX
 
+class WXDLLEXPORT wxString;
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -99,7 +101,7 @@ public:
     // flags may be combination of wxRE_NOTBOL and wxRE_NOTEOL
     //
     // may only be called after successful call to Compile()
-    bool Matches(const wxString& str, int flags = 0) const;
+    bool Matches(const wxChar *text, int flags = 0) const;
 
     // get the start index and the length of the match of the expression
     // (index 0) or a bracketed subexpression (index != 0)
@@ -118,7 +120,24 @@ public:
     // replaces the current regular expression in the string pointed to by
     // pattern, with the text in replacement and return number of matches
     // replaced (maybe 0 if none found) or -1 on error
-    int Replace(wxString *str, const wxString& replacement) const;
+    //
+    // the replacement text may contain backreferences (\number) which will be
+    // replaced with the value of the corresponding subexpression in the
+    // pattern match
+    //
+    // maxMatches may be used to limit the number of replacements made, setting
+    // it to 1, for example, will only replace first occurence (if any) of the
+    // pattern in the text while default value of 0 means replace all
+    int Replace(wxString *text, const wxString& replacement,
+                size_t maxMatches = 0) const;
+
+    // replace the first occurence
+    int ReplaceFirst(wxString *text, const wxString& replacement) const
+        { return Replace(text, replacement, 1); }
+
+    // replace all occurences: this is actually a synonym for Replace()
+    int ReplaceAll(wxString *text, const wxString& replacement) const
+        { return Replace(text, replacement, 0); }
 
     // dtor not virtual, don't derive from this class
     ~wxRegEx();