fixed typo in wxString::swap() which was completely broken

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index e024d0e52a6ba420c9c9ba0c3f800c4f034f9d61..946d106cb2d15c0e2e1a238ad1240b07eb378587 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -20,16 +20,12 @@
 
 #if wxUSE_REGEX
 
 
 #if wxUSE_REGEX
 

+class WXDLLEXPORT wxString;
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 

-// max number of subexpression matches, the default should be big enough for
-// all uses but may be a bit wasteful
-#ifndef WX_REGEX_MAXMATCHES
-    #define WX_REGEX_MAXMATCHES 1024
-#endif
-

 // flags for regex compilation: these can be used with Compile()
 enum
 {
 // flags for regex compilation: these can be used with Compile()
 enum
 {


@@ -146,6 +142,11 @@ private:
 
     // the real guts of this class
     wxRegExImpl *m_impl;
 
     // the real guts of this class
     wxRegExImpl *m_impl;

+
+    // as long as the class wxRegExImpl is not ref-counted,
+    // instances of the handle wxRegEx must not be copied.
+    wxRegEx(const wxRegEx&);
+    wxRegEx &operator=(const wxRegEx&);

 };
 
 #endif // wxUSE_REGEX
 };
 
 #endif // wxUSE_REGEX