applied fixes for CodeWarrior compilation

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

diff --git a/include/wx/regex.h b/include/wx/regex.h
index 946d106cb2d15c0e2e1a238ad1240b07eb378587..78224ca9420d13cd3ce0d45c46474998b826653f 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(NO_GCC_PRAGMA)

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


@@ -20,7 +20,7 @@
 
 #if wxUSE_REGEX
 
 
 #if wxUSE_REGEX
 

-class WXDLLEXPORT wxString;
+class WXDLLIMPEXP_BASE wxString;

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


@@ -67,9 +67,9 @@ enum
 // wxRegEx: a regular expression
 // ----------------------------------------------------------------------------
 
 // wxRegEx: a regular expression
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxRegExImpl;
+class WXDLLIMPEXP_BASE wxRegExImpl;

 
 

-class WXDLLEXPORT wxRegEx
+class WXDLLIMPEXP_BASE wxRegEx

 {
 public:
     // default ctor: use Compile() later
 {
 public:
     // default ctor: use Compile() later