Fixed Exception handling in MSVC project (\\GX)

2.
No longer wxUSE_NEW_REGEX, just wxUSE_UNICODE

3.
Various changes concerning #2

NOTE:  I testing this in unicode and it works!!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ryan Norton
2003-12-14 16:57:30 +00:00
parent fdde072772
commit 1ce5dd35eb
4 changed files with 127 additions and 107 deletions

View File

@@ -49,7 +49,7 @@
#include "wx/regex.h"
#ifdef wxUSE_NEW_REGEX
#ifdef wxUSE_UNICODE
#define regerror wx_regerror
#define regfree wx_regfree
#endif
@@ -187,7 +187,7 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
// compile it
#if wxUSE_NEW_REGEX
#if wxUSE_UNICODE
int errorcode = wx_regcomp(&m_RegEx, expr, expr.Length(), flagsRE);
#else
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
#ifdef wxUSE_NEW_REGEX
#ifdef wxUSE_UNICODE
rm_detail_t rd;
int rc = wx_regexec(&self->m_RegEx, str, wxStrlen(str), &rd, m_nMatches, m_Matches, flagsRE);
#else