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

wxWinCE build fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-10-30 18:06:44 +00:00
parent 176d982410
commit 92df97b87b
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/string.cpp
View File

@@ -35,7 +35,11 @@
#endif #endif
#include <ctype.h> #include <ctype.h>
#include <errno.h>
#ifndef __WXWINCE__
#include <errno.h>
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -1604,7 +1608,7 @@ wxString& wxString::Trim(bool bFromRight)
reverse_iterator psz = rbegin(); reverse_iterator psz = rbegin();
while ( (psz != rend()) && wxSafeIsspace(*psz) ) while ( (psz != rend()) && wxSafeIsspace(*psz) )
psz++; psz++;
// truncate at trailing space start // truncate at trailing space start
erase(psz.base(), end()); erase(psz.base(), end());
} }
@@ -1688,14 +1692,20 @@ bool wxStringToIntType(const wxChar *start,
wxCHECK_MSG( val, false, _T("NULL output pointer") ); wxCHECK_MSG( val, false, _T("NULL output pointer") );
wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") ); wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
#ifndef __WXWINCE__
errno = 0; errno = 0;
#endif
wxChar *end; wxChar *end;
*val = (*func)(start, &end, base); *val = (*func)(start, &end, base);
// return true only if scan was stopped by the terminating NUL and if the // return true only if scan was stopped by the terminating NUL and if the
// string was not empty to start with and no under/overflow occurred // string was not empty to start with and no under/overflow occurred
return !*end && (end != start) && (errno != ERANGE); return !*end && (end != start)
#ifndef __WXWINCE__
&& (errno != ERANGE)
#endif
;
} }
#define wxSTR2INT(val, b, func) return wxStringToIntType(c_str(), val, b, func) #define wxSTR2INT(val, b, func) return wxStringToIntType(c_str(), val, b, func)
@@ -1756,7 +1766,9 @@ bool wxString::ToDouble(double *val) const
{ {
wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") ); wxCHECK_MSG( val, false, _T("NULL pointer in wxString::ToDouble") );
#ifndef __WXWINCE__
errno = 0; errno = 0;
#endif
const wxChar *start = c_str(); const wxChar *start = c_str();
wxChar *end; wxChar *end;
@@ -1764,7 +1776,11 @@ bool wxString::ToDouble(double *val) const
// return true only if scan was stopped by the terminating NUL and if the // return true only if scan was stopped by the terminating NUL and if the
// string was not empty to start with and no under/overflow occurred // string was not empty to start with and no under/overflow occurred
return !*end && (end != start) && (errno != ERANGE); return !*end && (end != start)
#ifndef __WXWINCE__
&& (errno != ERANGE)
#endif
;
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------