build fixes

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index bda45030d2de42535241c6aa91356831fc8c8c4c..9889d34777443ed449b1d3ce4c708fb5b7ec86cc 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_REGEX
 
-class WXDLLIMPEXP_BASE wxString;
+class WXDLLIMPEXP_FWD_BASE wxString;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -68,7 +68,7 @@ enum
 // wxRegEx: a regular expression
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_BASE wxRegExImpl;
+class WXDLLIMPEXP_FWD_BASE wxRegExImpl;
 
 class WXDLLIMPEXP_BASE wxRegEx
 {
@@ -97,10 +97,9 @@ public:
     // len may be the length of text (ignored by most system regex libs)
     //
     // may only be called after successful call to Compile()
-    bool Matches(const wxChar *text, int flags = 0) const;
-    bool Matches(const wxChar *text, int flags, size_t len) const;
-    bool Matches(const wxString& text, int flags = 0) const
-        { return Matches(text.c_str(), flags, text.length()); }
+    bool Matches(const wxString& text, int flags = 0) const;
+    bool Matches(const wxChar *text, int flags, size_t len) const
+        { return Matches(wxString(text, len), flags); }
 
     // get the start index and the length of the match of the expression
     // (index 0) or a bracketed subexpression (index != 0)