Use wxClientDataDictionary for client data.

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 8fb775da6d1a397972cd3ebb54c62cefc0b33948..812405852f9a1b44dea102ec1083b056ff1113aa 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "regex.h"
 #endif
 
     #pragma interface "regex.h"
 #endif
 


@@ -26,12 +26,6 @@ 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
 {


@@ -148,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