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

Change the name of a symbol to make it more descriptive

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-11-11 19:33:47 +00:00
parent f302b6a445
commit db9db9cd18
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/regex.cpp
View File

@@ -47,7 +47,7 @@
// defined when the regex lib uses 'char' but 'wxChar' is wide // defined when the regex lib uses 'char' but 'wxChar' is wide
#if wxUSE_UNICODE && !defined(__REG_NOFRONT) #if wxUSE_UNICODE && !defined(__REG_NOFRONT)
# define WX_NEED_CONVERT # define WXREGEX_CONVERT_TO_MB
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -55,7 +55,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the character type used by the regular expression engine // the character type used by the regular expression engine
#ifndef WX_NEED_CONVERT #ifndef WXREGEX_CONVERT_TO_MB
typedef wxChar wxRegChar; typedef wxChar wxRegChar;
#else #else
typedef char wxRegChar; typedef char wxRegChar;
@@ -142,7 +142,7 @@ wxRegExImpl::~wxRegExImpl()
wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const wxString wxRegExImpl::GetErrorMsg(int errorcode, bool badconv) const
{ {
#ifdef WX_NEED_CONVERT #ifdef WXREGEX_CONVERT_TO_MB
// currently only needed when using system library in Unicode mode // currently only needed when using system library in Unicode mode
if ( badconv ) if ( badconv )
{ {
@@ -347,7 +347,7 @@ int wxRegExImpl::Replace(wxString *text,
wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") ); wxCHECK_MSG( IsValid(), wxNOT_FOUND, _T("must successfully Compile() first") );
// the input string // the input string
#ifndef WX_NEED_CONVERT #ifndef WXREGEX_CONVERT_TO_MB
const wxChar *textstr = text->c_str(); const wxChar *textstr = text->c_str();
size_t textlen = text->length(); size_t textlen = text->length();
#else #else
@@ -462,7 +462,7 @@ int wxRegExImpl::Replace(wxString *text,
if (result.capacity() < result.length() + start + textNew.length()) if (result.capacity() < result.length() + start + textNew.length())
result.reserve(2 * result.length()); result.reserve(2 * result.length());
#ifndef WX_NEED_CONVERT #ifndef WXREGEX_CONVERT_TO_MB
result.append(*text, matchStart, start); result.append(*text, matchStart, start);
#else #else
result.append(wxString(textstr + matchStart, *wxConvCurrent, start)); result.append(wxString(textstr + matchStart, *wxConvCurrent, start));
@@ -475,7 +475,7 @@ int wxRegExImpl::Replace(wxString *text,
matchStart += len; matchStart += len;
} }
#ifndef WX_NEED_CONVERT #ifndef WXREGEX_CONVERT_TO_MB
result.append(*text, matchStart, wxString::npos); result.append(*text, matchStart, wxString::npos);
#else #else
result.append(wxString(textstr + matchStart, *wxConvCurrent)); result.append(wxString(textstr + matchStart, *wxConvCurrent));
@@ -522,7 +522,7 @@ bool wxRegEx::Matches(const wxChar *str, int flags) const
{ {
wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") ); wxCHECK_MSG( IsValid(), false, _T("must successfully Compile() first") );
#ifndef WX_NEED_CONVERT #ifndef WXREGEX_CONVERT_TO_MB
return m_impl->Matches(str, flags, wxStrlen(str)); return m_impl->Matches(str, flags, wxStrlen(str));
#else #else
return m_impl->Matches(wxConvertWX2MB(str), flags, wxStrlen(str)); return m_impl->Matches(wxConvertWX2MB(str), flags, wxStrlen(str));