added and documented wx_const/static_cast<>

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 336631495f362d68298be504a49e655963e4cc3e..1656008c5ab16394cc38a881d9035bb42a775699 100644 (file)
--- a/include/wx/regex.h
+++ b/include/wx/regex.h
@@ -12,7 +12,7 @@
 #ifndef _WX_REGEX_H_
 #define _WX_REGEX_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "regex.h"
 #endif
 
@@ -20,7 +20,7 @@
 
 #if wxUSE_REGEX
 
-class WXDLLEXPORT_BASE wxString;
+class WXDLLIMPEXP_BASE wxString;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -29,8 +29,13 @@ class WXDLLEXPORT_BASE wxString;
 // flags for regex compilation: these can be used with Compile()
 enum
 {
-    // use extended regex syntax (default)
+    // use extended regex syntax
     wxRE_EXTENDED = 0,
+    
+    // use advanced RE syntax (built-in regex only)
+#ifdef wxHAS_REGEX_ADVANCED
+    wxRE_ADVANCED = 1,
+#endif
 
     // use basic RE syntax
     wxRE_BASIC    = 2,
@@ -67,9 +72,9 @@ enum
 // wxRegEx: a regular expression
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxRegExImpl;
+class WXDLLIMPEXP_BASE wxRegExImpl;
 
-class WXDLLEXPORT_BASE wxRegEx
+class WXDLLIMPEXP_BASE wxRegEx
 {
 public:
     // default ctor: use Compile() later