unicode compilation fix

[wxWidgets.git] / src / common / regex.cpp

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index e96257c8b6898816d905566c336c034f85b595b2..9c7e55c04057f48b793d4af8ceca93c0fe780226 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -18,7 +18,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "regex.h"
 #endif
 
@@ -43,7 +43,9 @@
     #include <sys/types.h>
 #endif
 
+#ifndef __WXWINCE__
 #include <regex.h>
+#endif
 
 #include "wx/regex.h"
 
@@ -146,9 +148,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
 
         msg = wxString(buf.data(), wxConvLibc);
 #else // !Unicode
-        (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
-
-        msg.UngetWriteBuf();
+        (void)regerror(errorcode, &m_RegEx, wxStringBuffer(msg, len), len);
 #endif // Unicode/!Unicode
     }
     else // regerror() returned 0