rename old wxAppConsole to wxAppConsoleBase and wxAppConsoleUnix to wxAppConsole...

[wxWidgets.git] / src / common / regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 7217296d2f5b11b6e6822c351f3ed07b1fff241b..33458574c99247dfdfbb12b874af393c0e846746 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -634,21 +634,12 @@ bool wxRegEx::Compile(const wxString& expr, int flags)
     return true;
 }
 
-bool wxRegEx::Matches(const wxChar *str, int flags, size_t len) const
+bool wxRegEx::Matches(const wxString& str, int flags) const
 {
     wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
-    (void)len;
 
-    return m_impl->Matches(WXREGEX_CHAR(str), flags WXREGEX_IF_NEED_LEN(len));
-}
-
-bool wxRegEx::Matches(const wxChar *str, int flags) const
-{
-    wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
-
-    return m_impl->Matches(WXREGEX_CHAR(str),
-                           flags
-                           WXREGEX_IF_NEED_LEN(wxStrlen(str)));
+    return m_impl->Matches(WXREGEX_CHAR(str), flags
+                            WXREGEX_IF_NEED_LEN(str.length()));
 }
 
 bool wxRegEx::GetMatch(size_t *start, size_t *len, size_t index) const