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

some compilation "enhancements"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-04 17:39:04 +00:00
parent dbac6cad78
commit 566b84d2ad
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/string.cpp
View File

@@ -63,7 +63,7 @@
// ---------------------------------------------------------------------------
#ifdef wxSTD_STRING_COMPATIBILITY
const size_t wxString::npos = STRING_MAXLEN;
const size_t wxString::npos = wxSTRING_MAXLEN;
#endif // wxSTD_STRING_COMPATIBILITY
// ----------------------------------------------------------------------------
@@ -104,9 +104,17 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
// always available), but it's unsafe because it doesn't check for buffer
// size - so give a warning
#define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
#ifndef __SC__
#if defined(__VISUALC__)
#pragma message("Using sprintf() because no snprintf()-like function defined")
#endif
#elif defined(__GNUG__)
#warning "Using sprintf() because no snprintf()-like function defined"
#elif defined(__SUNCC__)
// nothing -- I don't know about "#warning" for Sun's CC
#else
// change this to some analogue of '#warning' for your compiler
#error "Using sprintf() because no snprintf()-like function defined"
#endif //compiler
#endif // no vsnprintf
// ----------------------------------------------------------------------------
@@ -211,7 +219,7 @@ void wxString::InitWith(const char *psz, size_t nPos, size_t nLength)
wxASSERT( nPos <= Strlen(psz) );
if ( nLength == STRING_MAXLEN )
if ( nLength == wxSTRING_MAXLEN )
nLength = Strlen(psz + nPos);
STATISTICS_ADD(InitialLength, nLength);
@@ -611,8 +619,8 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const
wxStringData *pData = GetStringData();
size_t nLen = pData->nDataLength;
// default value of nCount is STRING_MAXLEN and means "till the end"
if ( nCount == STRING_MAXLEN )
// default value of nCount is wxSTRING_MAXLEN and means "till the end"
if ( nCount == wxSTRING_MAXLEN )
{
nCount = nLen - nFirst;
}