X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/765624f7350bf32b1c78a10ab1a1e10729c52cd1..b6fa290b5a077a97ec79496972302bccd567bf73:/include/wx/regex.h diff --git a/include/wx/regex.h b/include/wx/regex.h index e024d0e52a..78224ca942 100644 --- a/include/wx/regex.h +++ b/include/wx/regex.h @@ -12,7 +12,7 @@ #ifndef _WX_REGEX_H_ #define _WX_REGEX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "regex.h" #endif @@ -20,16 +20,12 @@ #if wxUSE_REGEX +class WXDLLIMPEXP_BASE wxString; + // ---------------------------------------------------------------------------- // 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 { @@ -71,9 +67,9 @@ enum // wxRegEx: a regular expression // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRegExImpl; +class WXDLLIMPEXP_BASE wxRegExImpl; -class WXDLLEXPORT wxRegEx +class WXDLLIMPEXP_BASE wxRegEx { public: // default ctor: use Compile() later @@ -146,6 +142,11 @@ private: // 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