* Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
* Created: 1998/06/12
* RCS-ID: $Id$
- * Copyright: (c) 1998-2002 wxWindows dev team
+ * Copyright: (c) 1998-2002 Joel Farley, Ove Kåven, Robert Roebling, Ron Lee
* Licence: wxWindows licence
*/
#ifndef _WX_WXCHAR_H_
#define _WX_WXCHAR_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "wxchar.h"
-#endif
+/* defs.h indirectly includes this file, so don't include it here */
+#include "wx/platform.h"
+#include "wx/dlimpexp.h"
-#include "wx/defs.h" /* for wxUSE_UNICODE */
+#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 **);
+#endif
/* check whether we have wchar_t and which size it is if we do */
#if !defined(wxUSE_WCHAR_T)
/*
Standard headers we need here.
- NB: don't include any wxWindows headers here because almost of them include
+ NB: don't include any wxWidgets headers here because almost all of them include
this one!
*/
/* Almost all compiler have strdup(), but not quite all: CodeWarrior under Mac */
/* and VC++ for Windows CE don't provide it */
-#if !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__)
+#if defined(__VISUALC__) && __VISUALC__ >= 1400
+ #define wxStrdupA _strdup
+#elif !(defined(__MWERKS__) && defined(__WXMAC__)) && !defined(__WXWINCE__)
/* use #define, not inline wrapper, as it is tested with #ifndef below */
#define wxStrdupA strdup
#endif
#endif
#endif
#if defined(__MWERKS__) && !defined(__MACH__)
- #ifndef HAVE_WCSLEN
- #define HAVE_WCSLEN
- #endif
+ #ifndef HAVE_WCSLEN
+ #define HAVE_WCSLEN
+ #endif
#endif
#if wxUSE_WCHAR_T
/* Cygwin versions, wchar.h requires sys/types.h */
#ifdef __CYGWIN__
#include <sys/types.h>
- extern "C" {
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
#endif /* Cygwin */
- #include <wchar.h>
- #ifdef __CYGWIN__
+
+ #include <wchar.h>
+
+ #if defined(__CYGWIN__) && defined(__cplusplus)
}
- #endif /* Cygwin */
+ #endif /* Cygwin and C++ */
+
#elif defined(HAVE_WCSTR_H)
/* old compilers have relevant declarations here */
#include <wcstr.h>
#define wxHAVE_TCHAR_SUPPORT
#elif defined(__DMC__)
#define wxHAVE_TCHAR_SUPPORT
+#elif defined(__WXPALMOS__)
+ #include <stddef.h>
#elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
#define wxHAVE_TCHAR_SUPPORT
#include <stddef.h>
#define wxHAVE_TCHAR_SUPPORT
#endif /* compilers with (good) TCHAR support */
-#ifdef __MWERKS__
- #define HAVE_WPRINTF
-#endif
+#if defined(__MWERKS__)
+ /* Metrowerks only has wide char support for OS X >= 10.3 */
+ #if !defined(__DARWIN__) || \
+ (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
+ #define wxHAVE_MWERKS_UNICODE
+ #endif
+
+ #ifdef wxHAVE_MWERKS_UNICODE
+ #define HAVE_WPRINTF
+ #endif
+#endif /* __MWERKS__ */
#ifdef wxHAVE_TCHAR_SUPPORT
/* get TCHAR definition if we've got it */
/* char wchar_t is always unsigned) and (b) was how the previous */
/* definitions worked so keep it like this */
+ /* Sun's SunPro compiler supports the wchar_t type and wide character */
+ /* functions, but does not define __WCHAR_TYPE__. Define it here to */
+ /* allow unicode enabled builds. */
+ #if defined(__SUNPRO_CC) || defined(__SUNPRO_C)
+ #define __WCHAR_TYPE__ wxchar_t
+ #endif
+
/* GNU libc has __WCHAR_TYPE__ which requires special treatment, see */
/* comment below */
#if !defined(__WCHAR_TYPE__) || \
typedef wchar_t wxSChar;
typedef wchar_t wxUChar;
#else /* __WCHAR_TYPE__ and gcc < 2.96 */
- /* VS: wxWindows used to define wxChar as __WCHAR_TYPE__ here. However, */
+ /* VS: wxWidgets used to define wxChar as __WCHAR_TYPE__ here. However, */
/* this doesn't work with new GCC 3.x compilers because wchar_t is */
/* C++'s builtin type in the new standard. OTOH, old compilers (GCC */
/* 2.x) won't accept new definition of wx{S,U}Char, therefore we */
#if !wxUSE_UNICODE
#define _T(x) x
#else /* Unicode */
- #define _T(x) L ## x
+ /* use wxCONCAT_HELPER so that x could be expanded if it's a macro */
+ #define _T(x) wxCONCAT_HELPER(L, x)
#endif /* ASCII/Unicode */
#endif /* !defined(_T) */
/* although global macros with such names are normally bad, we want to have */
/* another name for _T() which should be used to avoid confusion between _T() */
-/* and _() in wxWindows sources */
+/* and _() in wxWidgets sources */
#define wxT(x) _T(x)
/* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
#ifdef wxHAVE_TCHAR_SUPPORT
#include <ctype.h>
+ #if defined(__WATCOMC__) && defined(UNICODE)
+ #define WXWCHAR_T_CAST(c) (wint_t)(c)
+ #else
+ #define WXWCHAR_T_CAST(c) c
+ #endif
+
/* ctype.h functions */
- #define wxIsalnum _istalnum
- #define wxIsalpha _istalpha
- #define wxIscntrl _istcntrl
- #define wxIsdigit _istdigit
- #define wxIsgraph _istgraph
- #define wxIslower _istlower
- #define wxIsprint _istprint
- #define wxIspunct _istpunct
- #define wxIsspace _istspace
- #define wxIsupper _istupper
- #define wxIsxdigit _istxdigit
- #define wxTolower _totlower
- #define wxToupper _totupper
+ #define wxIsalnum(c) _istalnum(WXWCHAR_T_CAST(c))
+ #define wxIsalpha(c) _istalpha(WXWCHAR_T_CAST(c))
+ #define wxIscntrl(c) _istcntrl(WXWCHAR_T_CAST(c))
+ #define wxIsdigit(c) _istdigit(WXWCHAR_T_CAST(c))
+ #define wxIsgraph(c) _istgraph(WXWCHAR_T_CAST(c))
+ #define wxIslower(c) _istlower(WXWCHAR_T_CAST(c))
+ #define wxIsprint(c) _istprint(WXWCHAR_T_CAST(c))
+ #define wxIspunct(c) _istpunct(WXWCHAR_T_CAST(c))
+ #define wxIsspace(c) _istspace(WXWCHAR_T_CAST(c))
+ #define wxIsupper(c) _istupper(WXWCHAR_T_CAST(c))
+ #define wxIsxdigit(c) _istxdigit(WXWCHAR_T_CAST(c))
+
+ /*
+ There is a bug in VC6 C RTL: toxxx() functions dosn't do anything with
+ signed chars < 0, so "fix" it here.
+ */
+ #define wxTolower(c) _totlower((wxUChar)(c))
+ #define wxToupper(c) _totupper((wxUChar)(c))
/* locale.h functons */
#define wxSetlocale _tsetlocale
#define wxFgetc _fgettc
#define wxFgetchar _fgettchar
#define wxFgets _fgetts
- #define wxFopen _tfopen
+ #if wxUSE_UNICODE_MSLU
+ #define wxFopen wxMSLU__tfopen
+ #else
+ #define wxFopen _tfopen
+ #endif
#define wxFputc _fputtc
#define wxFputchar _fputtchar
#define wxFprintf _ftprintf
#define wxGets _getts
#define wxPerror _tperror
#define wxPrintf _tprintf
- #define wxPutc _puttc
+ #define wxPutc(c,f) _puttc(WXWCHAR_T_CAST(c),f)
#define wxPutchar _puttchar
#define wxPuts _putts
#define wxScanf _tscanf
#define wxRename wxMSLU__trename
#else
#ifdef __WXWINCE__
- #define wxRemove DeleteFile
+ /* carefully: wxRemove() must return 0 on success while DeleteFile()
+ returns 0 on error, so don't just define one as the other */
+ int wxRemove(const wxChar *path);
#else
#define wxRemove _tremove
#define wxRename _trename
#define wxAtoi _ttoi
#define wxAtol _ttol
/* #define wxAtof _tttof -- notice that there is no such thing (why?) */
- #define wxGetenv _tgetenv
+ /* 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 wxGetenv(name) ((wxChar *)NULL)
+ #else
+ #define wxGetenv _tgetenv
+ #endif
#define wxSystem _tsystem
/* time.h functions */
#define wxAsctime _tasctime
#define wxCtime _tctime
+
+ #define wxMbstowcs mbstowcs
+ #define wxWcstombs wcstombs
#else /* !TCHAR-aware compilers */
- #if wxUSE_UNICODE
+ /*
+ There are 2 unrelated problems with these functions under Mac:
+ a) Metrowerks MSL CRT implements them strictly in C99 sense and
+ doesn't support (very common) extension of allowing to call
+ mbstowcs(NULL, ...) which makes it pretty useless as you can't
+ know the size of the needed buffer
+ b) OS X <= 10.2 declares and even defined these functions but
+ doesn't really implement them -- they always return an error
+
+ So use our own replacements in both cases.
+ */
+ #if defined(__MWERKS__) && defined(__MSL__)
+ #define wxNEED_WX_MBSTOWCS
+ #endif
+
+ #ifdef __DARWIN__
+ #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2
+ #define wxNEED_WX_MBSTOWCS
+ #endif
+ #endif
+
+ #ifdef wxNEED_WX_MBSTOWCS
+ /* even though they are defined and "implemented", they are bad and just
+ stubs so we need our own - we need these even in ANSI builds!! */
+ WXDLLIMPEXP_BASE size_t wxMbstowcs (wchar_t *, const char *, size_t);
+ WXDLLIMPEXP_BASE size_t wxWcstombs (char *, const wchar_t *, size_t);
+ #else
+ #define wxMbstowcs mbstowcs
+ #define wxWcstombs wcstombs
+ #endif
+
+ /*
+ The system C library on Mac OS X 10.2 and below does not support
+ unicode: in other words all wide-character functions such as towupper et
+ al. do simply not exist so we need to provide our own in that context,
+ except for the wchar_t definition/typedef itself.
+
+ We need to do this for both project builder and CodeWarrior as
+ the latter uses the system C library in Mach builds for wide character
+ support, which as mentioned does not exist on 10.2 and below.
+ */
+ #if wxUSE_UNICODE && \
+ defined(__DARWIN__) && \
+ ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
+ /* we need everything! */
+ #define wxNEED_WX_STRING_H
+ #define wxNEED_WX_CTYPE_H
+
+ #define wxFgetchar(c) wxFgetc(c, stdin)
+ #define wxFputc wxPutc
+ #define wxFputchar(c) wxPutc(c, stdout)
+ #define wxGetc wxFgetc
+ #define wxGetchar(c) wxFgetc(c, stdin)
+
+ #include <stdio.h>
+
+ #define wxNEED_FGETC
+ #define wxNEED_FGETS
+ #define wxNEED_GETS
+ #define wxNEED_UNGETC
+
+ #define wxNEED_FPUTS
+ #define wxNEED_PUTS
+ #define wxNEED_PUTC
+
+ int wxFputs(const wxChar *ch, FILE *stream);
+ int wxPuts(const wxChar *ws);
+ int wxPutc(wxChar ch, FILE *stream);
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ WXDLLIMPEXP_BASE size_t wxStrlen_(const wxChar *s);
+ #ifdef __cplusplus
+ }
+ #endif
+
+ #define wxPutchar(wch) wxPutc(wch, stdout)
+
+ #define wxNEED_PRINTF_CONVERSION
+ #define wxNEED_WX_STDIO_H
+ #define wxNEED_WX_STDLIB_H
+ #define wxNEED_WX_TIME_H
+
+ #elif wxUSE_UNICODE
#include <wctype.h>
/* this is probably glibc-specific */
#define wxGets getws
#define wxUngetc ungetwc
- #ifdef HAVE_FPUTWC
- #define wxPutc wputc
- #define wxPutchar wputchar
- #define wxPuts putws
- #define wxFputs fputws
+ #ifdef HAVE_FPUTWS
+ #define wxFputs fputws
#else
- #define wxNEED_FPUTWC
-
+ #define wxNEED_FPUTS
#include <stdio.h>
-
int wxFputs(const wxChar *ch, FILE *stream);
+ #endif
+
+ #ifdef HAVE_WPUTC
+ #define wxPutc wputc
+ #else
+ #define wxNEED_PUTC
+ #include <stdio.h>
int wxPutc(wxChar ch, FILE *stream);
+ #endif
- #define wxPuts(ws) wxFputs(ws, stdout)
+ #ifdef HAVE_WPUTCHAR
+ #define wxPutchar wputchar
+ #else
#define wxPutchar(wch) wxPutc(wch, stdout)
#endif
+ #ifdef HAVE_PUTWS
+ #define wxPuts putws
+ #else
+ #define wxNEED_PUTS
+ int wxPuts(const wxChar *ws);
+ #endif
+
/* we need %s to %ls conversion for printf and scanf etc */
#define wxNEED_PRINTF_CONVERSION
#define wxNEED_WX_STDIO_H
/* stdlib.h functions */
+ #ifdef __MACH__
+ #define wxNEED_WX_STDLIB_H
+ #else
#define wxAtof watof
#define wxAtoi watoi
#define wxAtol watol
#define wxGetenv(a) ((wxChar*)NULL)
#define wxSystem(a) ((int)NULL)
-
+ #endif
/* time.h functions */
#define wxAsctime wasciitime
#define wxCtime wctime
defined(__EMX__) || defined(__DJGPP__)
#define wxStricmp stricmp
#define wxStrnicmp strnicmp
+ #elif defined(__WXPALMOS__)
+ /* FIXME: There is no equivalent to strnicmp in the Palm OS API. This
+ * quick hack should do until one can be written.
+ */
+ #define wxStricmp StrCaselessCompare
+ #define wxStrnicmp strnicmp
#elif defined(__SYMANTEC__) || defined(__VISUALC__) || \
(defined(__MWERKS__) && defined(__INTEL__))
#define wxStricmp _stricmp
#elif defined(__UNIX__) || defined(__GNUWIN32__)
#define wxStricmp strcasecmp
#define wxStrnicmp strncasecmp
- /* #else -- use wxWindows implementation */
+ /* #else -- use wxWidgets implementation */
#endif
#endif /* !defined(wxStricmp) */
#ifdef HAVE_WCSLEN
#define wxWcslen wcslen
#else
- inline size_t wxWcslen(const wchar_t *s)
- {
- size_t n = 0;
- while ( *s++ )
- n++;
-
- return n;
- }
+ WXDLLIMPEXP_BASE size_t wxWcslen(const wchar_t *s);
#endif
#endif /* wxUSE_WCHAR_T */
/* printf() family saga */
/*
- For some systems vsnprintf() exists in the system libraries but not in the
+ For some systems [v]snprintf() exists in the system libraries but not in the
headers, so we need to declare it ourselves to be able to use it.
*/
#if defined(HAVE_VSNPRINTF) && !defined(HAVE_VSNPRINTF_DECL)
+#ifdef __cplusplus
extern "C"
+#else
+ extern
+#endif
int vsnprintf(char *str, size_t size, const char *format, va_list ap);
#endif /* !HAVE_VSNPRINTF_DECL */
+#if defined(HAVE_SNPRINTF) && !defined(HAVE_SNPRINTF_DECL)
+#ifdef __cplusplus
+ extern "C"
+#else
+ extern
+#endif
+ int snprintf(char *str, size_t size, const char *format, ...);
+#endif /* !HAVE_SNPRINTF_DECL */
+
+/* Wrapper for vsnprintf if it's 3rd parameter is non-const. Note: the
+ * same isn't done for snprintf below, the builtin wxSnprintf_ is used
+ * instead since it's already a simple wrapper */
+#if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
+ inline int wx_fixed_vsnprintf(char *str, size_t size, const char *format, va_list ap)
+ {
+ return vsnprintf(str, size, (char*)format, ap);
+ }
+#endif
+
/*
First of all, we always want to define safe snprintf() function to be used
instead of sprintf(). Some compilers already have it (or rather vsnprintf()
*/
#ifndef wxVsnprintf_
#if wxUSE_UNICODE
- #if defined(__MWERKS__)
+ #ifdef wxHAVE_MWERKS_UNICODE
#define HAVE_WCSRTOMBS 1
#define HAVE_VSWPRINTF 1
- #endif
+ #endif /* Metrowerks with Unicode support */
#if defined(__WATCOMC__)
#define wxVsnprintf_ _vsnwprintf
#define wxSnprintf_ _snwprintf
- #endif
+ #endif /* Watcom */
#if defined(HAVE__VSNWPRINTF)
#define wxVsnprintf_ _vsnwprintf
/* MinGW?MSVCRT has the wrong vswprintf */
- #elif defined(HAVE_VSWPRINTF) && !defined(__MINGW32__)
+ /* Mac OS X has a somehow buggy vswprintf */
+ #elif defined(HAVE_VSWPRINTF) && !defined(__MINGW32__) && !defined(__DARWIN__)
#define wxVsnprintf_ vswprintf
#endif
#else /* ASCII */
- /* all versions of CodeWarrior supported by wxWindows apparently have */
- /* vsnprintf() */
+ /* all versions of CodeWarrior supported by wxWidgets apparently have */
+ /* both snprintf() and vsnprintf() */
+ #if defined(HAVE_SNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)
+ #ifndef HAVE_BROKEN_SNPRINTF_DECL
+ #define wxSnprintf_ snprintf
+ #endif
+ #endif
#if defined(HAVE_VSNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)
- /* assume we have snprintf() too if we have vsnprintf() */
- #define wxVsnprintf_ vsnprintf
- #define wxSnprintf_ snprintf
+ #if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
+ #define wxVsnprintf_ wx_fixed_vsnprintf
+ #else
+ #define wxVsnprintf_ vsnprintf
+ #endif
#endif
#endif
#endif /* wxVsnprintf_ not defined yet */
/* ctype.h functions */
-/* VZ: note that this is never defined currently */
+/* RN: Used only under OSX <= 10.2 currently */
#ifdef wxNEED_WX_CTYPE_H
WXDLLIMPEXP_BASE int wxIsalnum(wxChar ch);
WXDLLIMPEXP_BASE int wxIsalpha(wxChar ch);
#endif /* VC++ */
/*
- we had goofed and defined wxIctrl() instead of (correct) wxIscntrl() in the
+ a few compilers don't have the (non standard but common) isascii function,
+ define it ourselves for them
+ */
+#ifndef isascii
+ #if defined(__MWERKS__)
+ #define wxNEED_ISASCII
+ #elif defined(_WIN32_WCE)
+ #if _WIN32_WCE <= 211
+ #define wxNEED_ISASCII
+ #endif
+ #endif
+#endif /* isascii */
+
+#ifdef wxNEED_ISASCII
+ inline int isascii(int c) { return (unsigned)c < 0x80; }
+#endif
+
+#ifdef _WIN32_WCE
+ #if _WIN32_WCE <= 211
+ #define isspace(c) ((c) == _T(' ') || (c) == _T('\t'))
+ #endif
+#endif /* _WIN32_WCE */
+
+/*
+ we had goofed and defined wxIsctrl() instead of (correct) wxIscntrl() in the
initial versions of this header -- now it is too late to remove it so
although we fixed the function/macro name above, still provide the
backwards-compatible synonym.
#define wxIsctrl wxIscntrl
/* string.h functions */
+#ifndef strdup
+ #if defined(__MWERKS__) && !defined(__MACH__) && (__MSL__ < 0x00008000)
+ #define wxNEED_STRDUP
+ #elif defined(__WXWINCE__)
+ #if _WIN32_WCE <= 211
+ #define wxNEED_STRDUP
+ #endif
+ #endif
+#endif /* strdup */
+
+#ifdef wxNEED_STRDUP
+ WXDLLIMPEXP_BASE char *strdup(const char* s);
+#endif
-/* VZ: this is never defined neither currently */
+/* RN: Used only under OSX <= 10.2 currently
+ The __cplusplus ifdefs are messy, but they are required to build
+ the regex library, since c does not support function overloading
+*/
#ifdef wxNEED_WX_STRING_H
- WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
- WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
- WXDLLIMPEXP_BASE wxChar * wxStrchr(wxChar *s, wxChar c)
- { return (wxChar *)wxStrchr((const wxChar *)s, c); }
- WXDLLIMPEXP_BASE int wxStrcmp(const wxChar *s1, const wxChar *s2);
- WXDLLIMPEXP_BASE int wxStrcoll(const wxChar *s1, const wxChar *s2);
- WXDLLIMPEXP_BASE wxChar * wxStrcpy(wxChar *dest, const wxChar *src);
- WXDLLIMPEXP_BASE size_t wxStrcspn(const wxChar *s, const wxChar *reject);
- WXDLLIMPEXP_BASE size_t wxStrlen(const wxChar *s);
- WXDLLIMPEXP_BASE wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n);
- WXDLLIMPEXP_BASE int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n);
- WXDLLIMPEXP_BASE wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n);
- WXDLLIMPEXP_BASE const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
- WXDLLIMPEXP_BASE wxChar * wxStrpbrk(wxChar *s, const wxChar *accept)
- { return (wxChar *)wxStrpbrk((const wxChar *)s, accept); }
- WXDLLIMPEXP_BASE const wxChar * wxStrrchr(const wxChar *s, wxChar c);
- WXDLLIMPEXP_BASE wxChar * wxStrrchr(wxChar *s, wxChar c)
- { return (wxChar *)wxStrrchr((const wxChar *)s, c); }
- WXDLLIMPEXP_BASE size_t wxStrspn(const wxChar *s, const wxChar *accept);
- WXDLLIMPEXP_BASE const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
- WXDLLIMPEXP_BASE wxChar *wxStrstr(wxChar *haystack, const wxChar *needle)
- { return (wxChar *)wxStrstr((const wxChar *)haystack, needle); }
+# ifdef __cplusplus
+ extern "C" {
+# endif
+ WXDLLIMPEXP_BASE wxChar * wxStrcat(wxChar *dest, const wxChar *src);
+ WXDLLIMPEXP_BASE const wxChar * wxStrchr(const wxChar *s, wxChar c);
+ WXDLLIMPEXP_BASE int wxStrcmp(const wxChar *s1, const wxChar *s2);
+ WXDLLIMPEXP_BASE int wxStrcoll(const wxChar *s1, const wxChar *s2);
+ WXDLLIMPEXP_BASE wxChar * wxStrcpy(wxChar *dest, const wxChar *src);
+ WXDLLIMPEXP_BASE size_t wxStrcspn(const wxChar *s, const wxChar *reject);
+ WXDLLIMPEXP_BASE wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n);
+ WXDLLIMPEXP_BASE int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n);
+ WXDLLIMPEXP_BASE wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n);
+ WXDLLIMPEXP_BASE const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
+ WXDLLIMPEXP_BASE const wxChar * wxStrrchr(const wxChar *s, wxChar c);
+ WXDLLIMPEXP_BASE size_t wxStrspn(const wxChar *s, const wxChar *accept);
+ WXDLLIMPEXP_BASE const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
+# ifdef __cplusplus
+ }
+# endif
+
+ /* These functions use C++, so we can't c extern them */
WXDLLIMPEXP_BASE double wxStrtod(const wxChar *nptr, wxChar **endptr);
WXDLLIMPEXP_BASE long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base);
WXDLLIMPEXP_BASE unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base);
WXDLLIMPEXP_BASE size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
+
+ /* inlined versions */
+ #ifdef __cplusplus
+ inline wxChar * wxStrchr(wxChar *s, wxChar c)
+ { return (wxChar *)wxStrchr((const wxChar *)s, c); }
+ inline wxChar * wxStrpbrk(wxChar *s, const wxChar *accept)
+ { return (wxChar *)wxStrpbrk((const wxChar *)s, accept); }
+ inline wxChar * wxStrrchr(wxChar *s, wxChar c)
+ { return (wxChar *)wxStrrchr((const wxChar *)s, c); }
+ inline wxChar *wxStrstr(wxChar *haystack, const wxChar *needle)
+ { return (wxChar *)wxStrstr((const wxChar *)haystack, needle); }
+ #endif
+
#endif /* wxNEED_WX_STRING_H */
#ifndef wxStrdupA
#if defined(__MWERKS__) && defined(macintosh)
#include <time.h>
#endif
+ /*silent gabby compilers*/
+ struct tm;
WXDLLIMPEXP_BASE size_t wxStrftime(wxChar *s, size_t max,
const wxChar *fmt, const struct tm *tm);
#endif /* wxNEED_WX_TIME_H */
#if (_WIN32_WCE < 300)
WXDLLIMPEXP_BASE void *calloc( size_t num, size_t size );
#endif
-WXDLLIMPEXP_BASE char* strdup(const char* s);
-
-#if _WIN32_WCE <= 211
-WXDLLIMPEXP_BASE int isspace(int c);
-WXDLLIMPEXP_BASE int isascii( int c );
-#endif
-#endif
+#endif /* _WIN32_WCE */
/* multibyte to wide char conversion functions and macros */
#define wxWX2WC wxMB2WC
#endif
#else /* !wxUSE_UNICODE */
+/* Why is this here?
+#error ha */
/* No wxUSE_WCHAR_T: we have to do something (JACS) */
#define wxMB2WC wxStrncpy
#define wxWC2MB wxStrncpy
#define wxWX2WC wxMB2WC
#endif
+/*
+ RN: The following are not normal versions of memcpy et al., rather
+ these are either char or widechar versions depending on
+ if unicode is used or not.
+*/
+
+#ifdef __cplusplus
+
+ //
+ // RN: We could do the usual tricky compiler detection here,
+ // and use their variant (such as wmemchr, etc.). The problem
+ // is that these functions are quite rare, even though they are
+ // part of the current POSIX standard. In addition, most compilers
+ // (including even MSC) inline them just like we do right in their
+ // headers.
+ //
+ #if wxUSE_UNICODE
+ #include <string.h> //for mem funcs
+
+ //implement our own wmem variants
+ inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
+ {
+ for(;l && *s != c;--l, ++s) {}
+
+ if(l)
+ return (wxChar*)s;
+ return NULL;
+ }
+
+ inline int wxTmemcmp(const wxChar* sz1, const wxChar* sz2, size_t len)
+ {
+ for(; *sz1 == *sz2 && len; --len, ++sz1, ++sz2) {}
+
+ if(len)
+ return *sz1 < *sz2 ? -1 : *sz1 > *sz2;
+ else
+ return 0;
+ }
+
+ inline wxChar* wxTmemcpy(wxChar* szOut, const wxChar* szIn, size_t len)
+ {
+ return (wxChar*) memcpy(szOut, szIn, len * sizeof(wxChar));
+ }
+
+ inline wxChar* wxTmemmove(wxChar* szOut, const wxChar* szIn, size_t len)
+ {
+ return (wxChar*) memmove(szOut, szIn, len * sizeof(wxChar));
+ }
+
+ inline wxChar* wxTmemset(wxChar* szOut, const wxChar cIn, size_t len)
+ {
+ wxChar* szRet = szOut;
+
+ while (len--)
+ *szOut++ = cIn;
+
+ return szRet;
+ }
+
+ #else /* !wxUSE_UNICODE */
+ # define wxTmemchr memchr
+ # define wxTmemcmp memcmp
+ # define wxTmemcpy memcpy
+ # define wxTmemmove memmove
+ # define wxTmemset memset
+ #endif /* wxUSE_UNICODE/!wxUSE_UNICODE */
+
+#endif /*__cplusplus*/
+
+
#endif /* _WX_WXCHAR_H_ */
projects / wxWidgets.git / blobdiff