diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h index 23e685dd2d..896cd12db0 100644 --- a/include/wx/hashmap.h +++ b/include/wx/hashmap.h @@ -74,13 +74,7 @@ protected: static void** AllocTable( size_t sz ) { -#ifdef __WXWINCE__ - void** ptr = (void **)malloc(sz * sizeof(void*)); - memset( ptr, 0, sz * sizeof(void*)); - return ptr; -#else return (void **)calloc(sz, sizeof(void*)); -#endif } }; diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 5cac45dfc9..9a30e286fa 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -927,6 +927,14 @@ WXDLLIMPEXP_BASE int wxSystem(const wxChar *psz); const wxChar *fmt, const struct tm *tm); #endif // wxNEED_WX_TIME_H +// missing functions in WinCE +#ifdef __WXWINCE__ +WXDLLIMPEXP_BASE char* strdup(const char* s); +WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); +WXDLLIMPEXP_BASE int isspace(int c); +WXDLLIMPEXP_BASE int isascii( int c ); +#endif + // ---------------------------------------------------------------------------- // multibyte to wide char conversion functions and macros // ---------------------------------------------------------------------------- diff --git a/src/common/string.cpp b/src/common/string.cpp index 964324306b..c43bde8e7d 100644 --- a/src/common/string.cpp +++ b/src/common/string.cpp @@ -1013,10 +1013,6 @@ wxString::Replace(const wxChar *szOld, const wxChar *szNew, bool bReplaceAll) return uiCount; } -#ifdef __WXWINCE__ -inline int isascii(wxChar c) { return (c >= 0) && (c <=127); } -#endif - bool wxString::IsAscii() const { const wxChar *s = (const wxChar*) *this; diff --git a/src/common/valtext.cpp b/src/common/valtext.cpp index 0b8f2b0ecc..2c2b1f0094 100644 --- a/src/common/valtext.cpp +++ b/src/common/valtext.cpp @@ -229,10 +229,6 @@ void wxTextValidator::SetExcludeList(const wxStringList& list) m_excludeList = list; } -#ifdef __WXWINCE__ -inline int isascii(wxChar c) { return (c >= 0) && (c <=127); } -#endif - void wxTextValidator::OnChar(wxKeyEvent& event) { /* diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp index 02ca10af2f..326c34dbe6 100644 --- a/src/common/wxchar.cpp +++ b/src/common/wxchar.cpp @@ -1408,3 +1408,31 @@ int isascii( int c ) } #endif // __MWERKS__ +#ifdef __WXWINCE__ +char* strdup(const char* s) +{ + char *dest = (char*) malloc( strlen( s ) + 1 ) ; + if ( dest ) + strcpy( dest , s ) ; + return dest ; +} + +void *calloc( size_t num, size_t size ) +{ + void** ptr = (void **)malloc(num * size); + memset( ptr, 0, num * size); + return ptr; +} + +int isspace(int c) +{ + return (c == ' '); +} + +int isascii( int c ) +{ + return ( c >= 0 && c < 128 ) ; +} +#endif + + diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 70c19c20ae..4b4e47e045 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -119,20 +119,6 @@ license is as follows: #include "wx/xpmdecod.h" -#ifdef __WXWINCE__ -char* strdup(const char* s) -{ - char* s2 = new char[strlen(s)]; - strcpy(s2, s); - return s2; -} - -bool isspace(char c) -{ - return (c == ' '); -} -#endif - #if wxUSE_STREAMS bool wxXPMDecoder::CanRead(wxInputStream& stream) {