X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a02058ab22bd6347d41584394b45a347263c0e3..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/wxcrtbase.h diff --git a/include/wx/wxcrtbase.h b/include/wx/wxcrtbase.h index 07828befe9..f69584b836 100644 --- a/include/wx/wxcrtbase.h +++ b/include/wx/wxcrtbase.h @@ -2,7 +2,7 @@ * Name: wx/wxcrtbase.h * Purpose: Type-safe ANSI and Unicode builds compatible wrappers for * CRT functions - * Author: Joel Farley, Ove Kåven + * Author: Joel Farley, Ove Kaaven * Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee * Created: 1998/06/12 * RCS-ID: $Id$ @@ -28,12 +28,21 @@ include this one! */ +#if !defined(__WXPALMOS5__) #include #include #include -#include +#if defined(__WXPALMOS__) + #include +#else + #include +#endif #include +#endif +#if defined(__WINDOWS__) && !defined(__WXWINCE__) + #include +#endif #if defined(HAVE_STRTOK_R) && defined(__DARWIN__) && defined(_MSL_USING_MW_C_HEADERS) && _MSL_USING_MW_C_HEADERS char *strtok_r(char *, const char *, char **); @@ -129,7 +138,6 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #define wxCRT_StrcatA strcat #define wxCRT_StrchrA strchr #define wxCRT_StrcmpA strcmp -#define wxCRT_StrcollA strcoll #define wxCRT_StrcpyA strcpy #define wxCRT_StrcspnA strcspn #define wxCRT_StrlenA strlen @@ -140,12 +148,10 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #define wxCRT_StrrchrA strrchr #define wxCRT_StrspnA strspn #define wxCRT_StrstrA strstr -#define wxCRT_StrxfrmA strxfrm #define wxCRT_StrcatW wcscat #define wxCRT_StrchrW wcschr #define wxCRT_StrcmpW wcscmp -#define wxCRT_StrcollW wcscoll #define wxCRT_StrcpyW wcscpy #define wxCRT_StrcspnW wcscspn #define wxCRT_StrncatW wcsncat @@ -155,7 +161,15 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); #define wxCRT_StrrchrW wcsrchr #define wxCRT_StrspnW wcsspn #define wxCRT_StrstrW wcsstr -#define wxCRT_StrxfrmW wcsxfrm + +/* these functions are not defined under CE, at least in VC8 CRT */ +#if !defined(__WXWINCE__) && !defined(__WXPALMOS__) + #define wxCRT_StrcollA strcoll + #define wxCRT_StrxfrmA strxfrm + + #define wxCRT_StrcollW wcscoll + #define wxCRT_StrxfrmW wcsxfrm +#endif /* __WXWINCE__ */ /* Almost all compiler have strdup(), but not quite all: CodeWarrior under Mac and VC++ for Windows CE don't provide it; additionally, gcc under @@ -215,7 +229,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); * versions */ #if !defined(wxCRT_StricmpA) #if defined(__BORLANDC__) || defined(__WATCOMC__) || \ - defined(__SALFORDC__) || defined(__VISAGECPP__) || \ + defined(__VISAGECPP__) || \ defined(__EMX__) || defined(__DJGPP__) #define wxCRT_StricmpA stricmp #define wxCRT_StrnicmpA strnicmp @@ -224,7 +238,7 @@ WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size ); * quick hack should do until one can be written. */ #define wxCRT_StricmpA StrCaselessCompare - #define wxCRT_StrnicmpA strnicmp + #define wxCRT_StrnicmpA StrNCaselessCompare #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \ (defined(__MWERKS__) && defined(__INTEL__)) #define wxCRT_StricmpA _stricmp @@ -393,7 +407,7 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha stdio.h ------------------------------------------------------------------------- */ -#if defined(__UNIX__) || defined(__WXMAC__) +#if defined(__UNIX__) || defined(__WXMAC__) || defined(__WXPALMOS__) #define wxMBFILES 1 #else #define wxMBFILES 0 @@ -410,7 +424,6 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha #define wxCRT_Rename rename #else /* Unicode filenames */ - /* special case: these functions are missing under Win9x with Unicows so we have to implement them ourselves */ #if wxUSE_UNICODE_MSLU @@ -423,17 +436,17 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_StrtokW(wchar_t *psz, const wchar_t *delim, wcha #define wxCRT_Remove wxMSLU__wremove #define wxCRT_Rename wxMSLU__wrename #else - #define wxCRT_Rename _wrename - #define wxCRT_Fopen _wfopen - #define wxCRT_Freopen _wfreopen + /* WinCE CRT doesn't provide these functions so use our own */ #ifdef __WXWINCE__ - /* carefully: wxCRT_Remove() must return 0 on success while - DeleteFile() returns 0 on error, so don't just define one as - the other */ - int wxCRT_Remove(const wchar_t *path); + WXDLLIMPEXP_BASE int wxCRT_Rename(const wchar_t *src, + const wchar_t *dst); + WXDLLIMPEXP_BASE int wxCRT_Remove(const wchar_t *path); #else + #define wxCRT_Rename _wrename #define wxCRT_Remove _wremove #endif + #define wxCRT_Fopen _wfopen + #define wxCRT_Freopen _wfreopen #endif #endif /* wxMBFILES/!wxMBFILES */ @@ -473,20 +486,23 @@ WXDLLIMPEXP_BASE int wxCRT_FputsW(const wchar_t *ch, FILE *stream); WXDLLIMPEXP_BASE int wxCRT_FputcW(wchar_t wc, FILE *stream); #endif -#define wxCRT_TmpnamA tmpnam -#ifdef _ttmpnam - #define wxCRT_TmpnamW _wtmpnam -#endif +/* + NB: tmpnam() is unsafe and thus is not wrapped! + Use other wxWidgets facilities instead: + wxFileName::CreateTempFileName, wxTempFile, or wxTempFileOutputStream +*/ +#define wxTmpnam(x) wxTmpnam_is_insecure_use_wxTempFile_instead -#ifndef wxCRT_TmpnamW -WXDLLIMPEXP_BASE wchar_t *wxCRT_TmpnamW(wchar_t *s); -#endif +/* FIXME-CE: provide our own perror() using ::GetLastError() */ +#ifndef __WXWINCE__ #define wxCRT_PerrorA perror #ifdef wxHAVE_TCHAR_SUPPORT #define wxCRT_PerrorW _wperror #endif +#endif /* !__WXWINCE__ */ + /* ------------------------------------------------------------------------- stdlib.h ------------------------------------------------------------------------- */ @@ -494,8 +510,8 @@ WXDLLIMPEXP_BASE wchar_t *wxCRT_TmpnamW(wchar_t *s); /* there are no env vars at all under CE, so no _tgetenv neither */ #ifdef __WXWINCE__ /* can't define as inline function as this is a C file... */ - #define wxCRT_GetenvA(name) ((char*)NULL) - #define wxCRT_GetenvW(name) ((wchar_t*)NULL) + #define wxCRT_GetenvA(name) (name, NULL) + #define wxCRT_GetenvW(name) (name, NULL) #else #define wxCRT_GetenvA getenv #ifdef _tgetenv @@ -531,7 +547,7 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); /* _wtof doesn't exist */ #else #ifndef __VMS - #define wxCRT_AtofW(s) wcstof(s, NULL) + #define wxCRT_AtofW(s) wcstod(s, NULL) #endif #define wxCRT_AtolW(s) wcstol(s, NULL, 10) /* wcstoi doesn't exist */ @@ -551,6 +567,9 @@ WXDLLIMPEXP_BASE wchar_t * wxCRT_GetenvW(const wchar_t *name); #if defined(__MWERKS__) && defined(__MSL__) #define wxNEED_WX_MBSTOWCS #endif +#if defined(__WXPALMOS__) + #define wxNEED_WX_MBSTOWCS +#endif #ifdef __DARWIN__ #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2