X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4e41ce37ac7bcb43663241439cee68ebeff7ffc..462bc04863a27a56a75faf72c20977a2e958c2a5:/include/wx/wxchar.h diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 384f083b09..d03f72b059 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -147,6 +147,10 @@ #define wxHAVE_TCHAR_SUPPORT #endif // compilers with (good) TCHAR support +#ifdef __MWERKS__ + #define HAVE_WPRINTF +#endif + #ifdef wxHAVE_TCHAR_SUPPORT // get TCHAR definition if we've got it #include @@ -434,7 +438,7 @@ #define wxNEED_WX_STDIO_H #define wxNEED_WX_STDLIB_H #define wxNEED_WX_TIME_H - #elif defined(__MWERKS__) && defined(macintosh) + #elif defined(__MWERKS__) && ( defined(macintosh) || defined(__MACH__) ) // ctype.h functions (wctype.h) #define wxIsalnum iswalnum #define wxIsalpha iswalpha @@ -480,6 +484,29 @@ #define wxGets getws #define wxUngetc ungetwc + #define wxNEED_PRINTF_CONVERSION + + #define wxPutc putwc + #define wxPutchar putwchar + #define wxFputs fputws + + // stdio.h functions + + #define wxNEED_WX_STDIO_H + + // stdlib.h functions + #define wxAtof watof + #define wxAtoi watoi + #define wxAtol watol + #define wxGetenv(a) ((wxChar*)NULL) + #define wxSystem(a) ((int)NULL) + + // time.h functions + #define wxAsctime wasciitime + #define wxCtime wctime + #define wxStrftime wcsftime + + /* #define wxNEED_FPUTWC #include @@ -497,6 +524,7 @@ #define wxNEED_WX_STDIO_H #define wxNEED_WX_STDLIB_H #define wxNEED_WX_TIME_H + */ #else // !metrowerks for apple #error "Please define wide character functions for your environment" #endif @@ -605,7 +633,7 @@ defined(__EMX__) || defined(__DJGPP__) #define wxStricmp stricmp #define wxStrnicmp strnicmp - #elif defined(__SC__) || defined(__VISUALC__) || \ + #elif defined(__SYMANTEC__) || defined(__VISUALC__) || \ (defined(__MWERKS__) && defined(__INTEL__)) #define wxStricmp _stricmp #define wxStrnicmp _strnicmp @@ -651,7 +679,7 @@ inline size_t wxStrlen(const wxChar *psz) { return psz ? wxStrlen_(psz) : 0; } #define wxStrdup wxStrdupA #endif -WXDLLEXPORT bool wxOKlibc(); // for internal use +WXDLLIMPEXP_BASE bool wxOKlibc(); // for internal use // ---------------------------------------------------------------------------- // printf() family saga @@ -677,6 +705,10 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use */ #ifndef wxVsnprintf_ #if wxUSE_UNICODE + #if defined(__MWERKS__) + #define HAVE_WCSRTOMBS 1 + #define HAVE_VSWPRINTF 1 + #endif #if defined(HAVE__VSNWPRINTF) #define wxVsnprintf_ _vsnwprintf /* MinGW?MSVCRT has the wrong vswprintf */ @@ -696,11 +728,11 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use #ifndef wxSnprintf_ // no [v]snprintf(), cook our own - WXDLLEXPORT int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, + WXDLLIMPEXP_BASE int wxSnprintf_(wxChar *buf, size_t len, const wxChar *format, ...) ATTRIBUTE_PRINTF_3; #endif #ifndef wxVsnprintf_ - WXDLLEXPORT int wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format, + WXDLLIMPEXP_BASE int wxVsnprintf_(wxChar *buf, size_t len, const wxChar *format, va_list argptr); #endif @@ -769,19 +801,19 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use // // VZ: note that this is never defined currently #ifdef wxNEED_WX_CTYPE_H - WXDLLEXPORT int wxIsalnum(wxChar ch); - WXDLLEXPORT int wxIsalpha(wxChar ch); - WXDLLEXPORT int wxIsctrl(wxChar ch); - WXDLLEXPORT int wxIsdigit(wxChar ch); - WXDLLEXPORT int wxIsgraph(wxChar ch); - WXDLLEXPORT int wxIslower(wxChar ch); - WXDLLEXPORT int wxIsprint(wxChar ch); - WXDLLEXPORT int wxIspunct(wxChar ch); - WXDLLEXPORT int wxIsspace(wxChar ch); - WXDLLEXPORT int wxIsupper(wxChar ch); - WXDLLEXPORT int wxIsxdigit(wxChar ch); - WXDLLEXPORT int wxTolower(wxChar ch); - WXDLLEXPORT int wxToupper(wxChar ch); + WXDLLIMPEXP_BASE int wxIsalnum(wxChar ch); + WXDLLIMPEXP_BASE int wxIsalpha(wxChar ch); + WXDLLIMPEXP_BASE int wxIsctrl(wxChar ch); + WXDLLIMPEXP_BASE int wxIsdigit(wxChar ch); + WXDLLIMPEXP_BASE int wxIsgraph(wxChar ch); + WXDLLIMPEXP_BASE int wxIslower(wxChar ch); + WXDLLIMPEXP_BASE int wxIsprint(wxChar ch); + WXDLLIMPEXP_BASE int wxIspunct(wxChar ch); + WXDLLIMPEXP_BASE int wxIsspace(wxChar ch); + WXDLLIMPEXP_BASE int wxIsupper(wxChar ch); + WXDLLIMPEXP_BASE int wxIsxdigit(wxChar ch); + WXDLLIMPEXP_BASE int wxTolower(wxChar ch); + WXDLLIMPEXP_BASE int wxToupper(wxChar ch); #endif // wxNEED_WX_CTYPE_H // under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks @@ -796,66 +828,66 @@ WXDLLEXPORT bool wxOKlibc(); // for internal use // // VZ: this is never defined neither currently #ifdef wxNEED_WX_STRING_H - WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src); - WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c); - WXDLLEXPORT wxChar * wxStrchr(wxChar *s, wxChar c) + 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); } - WXDLLEXPORT int wxStrcmp(const wxChar *s1, const wxChar *s2); - WXDLLEXPORT int wxStrcoll(const wxChar *s1, const wxChar *s2); - WXDLLEXPORT wxChar * wxStrcpy(wxChar *dest, const wxChar *src); - WXDLLEXPORT size_t wxStrcspn(const wxChar *s, const wxChar *reject); - WXDLLEXPORT size_t wxStrlen(const wxChar *s); - WXDLLEXPORT wxChar * wxStrncat(wxChar *dest, const wxChar *src, size_t n); - WXDLLEXPORT int wxStrncmp(const wxChar *s1, const wxChar *s2, size_t n); - WXDLLEXPORT wxChar * wxStrncpy(wxChar *dest, const wxChar *src, size_t n); - WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept); - WXDLLEXPORT wxChar * wxStrpbrk(wxChar *s, const wxChar *accept) + 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); } - WXDLLEXPORT const wxChar * wxStrrchr(const wxChar *s, wxChar c); - WXDLLEXPORT wxChar * wxStrrchr(wxChar *s, wxChar c) + 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); } - WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept); - WXDLLEXPORT const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle); - WXDLLEXPORT wxChar *wxStrstr(wxChar *haystack, const wxChar *needle) + 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); } - WXDLLEXPORT double wxStrtod(const wxChar *nptr, wxChar **endptr); - WXDLLEXPORT long int wxStrtol(const wxChar *nptr, wxChar **endptr, int base); - WXDLLEXPORT unsigned long int wxStrtoul(const wxChar *nptr, wxChar **endptr, int base); - WXDLLEXPORT size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n); + 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); #endif // wxNEED_WX_STRING_H #ifndef wxStrdupA -WXDLLEXPORT char *wxStrdupA(const char *psz); +WXDLLIMPEXP_BASE char *wxStrdupA(const char *psz); #endif #ifndef wxStrdupW -WXDLLEXPORT wchar_t *wxStrdupW(const wchar_t *pwz); +WXDLLIMPEXP_BASE wchar_t *wxStrdupW(const wchar_t *pwz); #endif #ifndef wxStricmp -WXDLLEXPORT int wxStricmp(const wxChar *psz1, const wxChar *psz2); +WXDLLIMPEXP_BASE int wxStricmp(const wxChar *psz1, const wxChar *psz2); #endif #ifndef wxStrnicmp -WXDLLEXPORT int wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len); +WXDLLIMPEXP_BASE int wxStrnicmp(const wxChar *psz1, const wxChar *psz2, size_t len); #endif #ifndef wxStrtok -WXDLLEXPORT wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr); +WXDLLIMPEXP_BASE wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **save_ptr); #endif #ifndef wxSetlocale -class WXDLLEXPORT wxWCharBuffer; -WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale); +class WXDLLIMPEXP_BASE wxWCharBuffer; +WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale); #endif // stdio.h functions #ifdef wxNEED_WX_STDIO_H #include - WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode); - WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream); - WXDLLEXPORT int wxRemove(const wxChar *path); - WXDLLEXPORT int wxRename(const wxChar *oldpath, const wxChar *newpath); + WXDLLIMPEXP_BASE FILE * wxFopen(const wxChar *path, const wxChar *mode); + WXDLLIMPEXP_BASE FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream); + WXDLLIMPEXP_BASE int wxRemove(const wxChar *path); + WXDLLIMPEXP_BASE int wxRename(const wxChar *oldpath, const wxChar *newpath); // *printf() family is handled separately #endif // wxNEED_WX_STDIO_H @@ -863,14 +895,14 @@ WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale); // stdlib.h functions #ifndef wxAtof -WXDLLEXPORT double wxAtof(const wxChar *psz); +WXDLLIMPEXP_BASE double wxAtof(const wxChar *psz); #endif #ifdef wxNEED_WX_STDLIB_H -WXDLLEXPORT int wxAtoi(const wxChar *psz); -WXDLLEXPORT long wxAtol(const wxChar *psz); -WXDLLEXPORT wxChar * wxGetenv(const wxChar *name); -WXDLLEXPORT int wxSystem(const wxChar *psz); +WXDLLIMPEXP_BASE int wxAtoi(const wxChar *psz); +WXDLLIMPEXP_BASE long wxAtol(const wxChar *psz); +WXDLLIMPEXP_BASE wxChar * wxGetenv(const wxChar *name); +WXDLLIMPEXP_BASE int wxSystem(const wxChar *psz); #endif @@ -879,7 +911,7 @@ WXDLLEXPORT int wxSystem(const wxChar *psz); #if defined(__MWERKS__) && defined(macintosh) #include #endif - WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, + WXDLLIMPEXP_BASE size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm); #endif // wxNEED_WX_TIME_H @@ -889,8 +921,8 @@ WXDLLEXPORT int wxSystem(const wxChar *psz); #if wxUSE_WCHAR_T // multibyte<->widechar conversion - WXDLLEXPORT size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n); - WXDLLEXPORT size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n); + WXDLLIMPEXP_BASE size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n); + WXDLLIMPEXP_BASE size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n); #if wxUSE_UNICODE #define wxMB2WX wxMB2WC