merged 2.4 branch into the trunk

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -132,7 +132,7 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const

        (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);

-        msg = buf.data();
+        msg = wxString(buf.data(), wxConvLibc);
 #else // !Unicode
        (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);