Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(should) fix unix compilation...

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-14 23:58:55 +00:00
parent 104cdef643
commit cffadd8447
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/regex.cpp
View File

@@ -49,7 +49,7 @@
#include "wx/regex.h" #include "wx/regex.h"
#if wxUSE_UNICODE #ifdef wx_wchar
#define regerror wx_regerror #define regerror wx_regerror
#define regfree wx_regfree #define regfree wx_regfree
#endif #endif
@@ -146,17 +146,17 @@ wxString wxRegExImpl::GetErrorMsg(int errorcode) const
{ {
len++; len++;
#if wxUSE_UNICODE #ifdef wx_wchar
wxCharBuffer buf(len); wxCharBuffer buf(len);
(void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len); (void)regerror(errorcode, &m_RegEx, (char *)buf.data(), len);
msg = wxString(buf.data(), wxConvLibc); msg = wxString(buf.data(), wxConvLibc);
#else // !Unicode #else
(void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len); (void)regerror(errorcode, &m_RegEx, msg.GetWriteBuf(len), len);
msg.UngetWriteBuf(); msg.UngetWriteBuf();
#endif // Unicode/!Unicode #endif
} }
else // regerror() returned 0 else // regerror() returned 0
{ {
@@ -187,7 +187,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// compile it // compile it
#if wxUSE_UNICODE #ifdef wx_wchar
int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), REG_ADVANCED); int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), REG_ADVANCED);
#else #else
int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE); int errorcode = regcomp(&m_RegEx, expr.mb_str(), flagsRE);
@@ -266,7 +266,7 @@ bool wxRegExImpl::Matches(const wxChar *str, int flags) const
} }
// do match it // do match it
#if wxUSE_UNICODE #ifdef wx_wchar
rm_detail_t rd; rm_detail_t rd;
int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE); int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
#else #else