#define wxHAVE_TCHAR_FUNCTIONS
#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x520)
#define wxHAVE_TCHAR_FUNCTIONS
+ #elif defined(__MINGW32__) && wxCHECK_W32API_VERSION( 1, 0 )
+ #define wxHAVE_TCHAR_FUNCTIONS
+ #include <stddef.h>
+ #include <string.h>
+ #include <ctype.h>
+ #elif defined(__CYGWIN__)
+ #ifndef HAVE_WCSLEN
+ #define HAVE_WCSLEN
+ #endif // !HAVE_WCSLEN
+ #include <stddef.h>
+ #include <wchar.h>
#endif
#elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
// VisualAge 4.0+ supports TCHAR
// time.h functions -- none defined in tchar.h
#define wxAsctime asctime
#define wxCtime ctime
+#elif defined(__MWERKS__)
+ // for wcslen
+ #if wxUSE_WCHAR_T
+ #include <wchar.h>
+ #endif
#endif // compilers with (good) TCHAR support
#ifdef wxHAVE_TCHAR_FUNCTIONS
# include <tchar.h>
# if wxUSE_UNICODE // temporary - preserve binary compatibility
+#if defined(__GNUWIN32__)
+ #define _TCHAR TCHAR
+ #define _TSCHAR TCHAR
+ #define _TUCHAR TCHAR
+#endif
+
typedef _TCHAR wxChar;
typedef _TSCHAR wxSChar;
typedef _TUCHAR wxUChar;
# define wxStrcspn _tcscspn
# define wxStrftime _tcsftime
# define wxStricmp _tcsicmp
+# define wxStrnicmp _tcsnicmp
# define wxStrlen_ _tcslen // used in wxStrlen inline function
# define wxStrncat _tcsncat
# define wxStrncmp _tcsncmp
// stdio.h functions
#ifndef wxNO_TCHAR_STDIO
+# if wxUSE_UNICODE_MSLU
+# define wxRemove wxMSLU__tremove
+# define wxRename wxMSLU__trename
+# else
+# define wxRemove _tremove
+# define wxRename _trename
+# endif
# define wxFgetc _fgettc
# define wxFgetchar _fgettchar
# define wxFgets _fgetts
# define wxPutc _puttc
# define wxPutchar _puttchar
# define wxPuts _putts
-# define wxRemove _tremove
-# define wxRename _trename
# define wxScanf _tscanf
# define wxSprintf _stprintf
# define wxSscanf _stscanf
# if defined(__VISUALC__) && (__VISUALC__ < 900)
# define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
# elif defined(__UNIX__)
-# if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
+# if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) || defined(__DARWIN__)
# define wxUSE_WCHAR_T 1
# else
# define wxUSE_WCHAR_T 0
# define wxUSE_WCHAR_T 0
# elif defined(__WATCOMC__)
# define wxUSE_WCHAR_T 0
-# elif defined(__VISAGECPP__) && (__IBMCPP__ >= 400)
-# define wxUSE_WCHAR_T 1
+# elif defined(__VISAGECPP__) && (__IBMCPP__ < 400)
+# define wxUSE_WCHAR_T 0
# else
- // add additional compiler checks if this fails
+ // add additional compiler checks if this fails
# define wxUSE_WCHAR_T 1
# endif
# endif // !defined(wxUSE_WCHAR_T)
-# if wxUSE_WCHAR_T
-# ifdef HAVE_WCSTR_H
-# include <wcstr.h>
-# else
-# ifndef __FreeBSD__
-# include <wchar.h>
-# else
-# include <stdlib.h>
-# define wxNEED_WCSLEN
-# endif
-# endif
-# endif
+# if wxUSE_WCHAR_T
+# ifdef HAVE_WCHAR_H
+ // include wchar.h to get wcslen() declaration used by wx/buffer.h
+ // stddef.h is needed for Cygwin
+# include <stddef.h>
+# include <wchar.h>
+# elif defined(HAVE_WCSTR_H)
+ // old compilers have wcslen() here
+# include <wcstr.h>
+# elif defined(__FreeBSD__) || defined(__DARWIN__) || defined(__EMX__)
+ // include stdlib.h for wchar_t, wcslen is provided in wxchar.cpp
+# include <stdlib.h>
+ size_t WXDLLEXPORT wcslen(const wchar_t *s);
+# endif // HAVE_WCHAR_H
+# endif // wxUSE_WCHAR_T
// check whether we are doing Unicode
# if wxUSE_UNICODE
# include <ctype.h>
# include <string.h>
-# if 0 // temporary - preserve binary compatibilty
- typedef char wxChar;
- typedef signed char wxSChar;
- typedef unsigned char wxUChar;
-# else
-# define wxChar char
-# define wxSChar signed char
-# define wxUChar unsigned char
-# endif
+ typedef char wxChar;
+ typedef signed char wxSChar;
+ typedef unsigned char wxUChar;
-# if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
+# if defined(__FreeBSD__) || defined(__DARWIN__)
# undef _T
# endif
// define wxStricmp for various compilers without Unicode possibilities
#if !defined(wxStricmp) && !wxUSE_UNICODE
-# if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__)
+# if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) || defined(__VISAGECPP__) || defined(__EMX__) || defined(__DJGPP__)
# define wxStricmp stricmp
# define wxStrnicmp strnicmp
# elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
# define wxStrcoll strcoll
# define wxStrcpy strcpy
# define wxStrcspn strcspn
+#if !defined(__MWERKS__) || !defined(__WXMAC__)
# define wxStrdup strdup
+#endif
# define wxStrlen_ strlen // used in wxStrlen inline function
# define wxStrncat strncat
# define wxStrncmp strncmp
# endif
#endif //!Unicode
-#if defined(wxNEED_WCSLEN) && wxUSE_UNICODE
-# define wcslen wxStrlen
-# undef wxNEED_WCSLEN
-#endif
-
// checks whether the passed in pointer is NULL and if the string is empty
inline bool wxIsEmpty(const wxChar *p) { return !p || !*p; }
WXDLLEXPORT int wxStricmp(const wxChar *psz1, const wxChar *psz2);
#endif
+#ifndef wxStrnicmp
+WXDLLEXPORT 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);
#endif
WXDLLEXPORT wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
#endif
-#ifdef wxNEED_WCSLEN // for use in buffer.h
-WXDLLEXPORT size_t wcslen(const wchar_t *s);
-#endif
-
#ifdef wxNEED_WX_CTYPE_H
WXDLLEXPORT int wxIsalnum(wxChar ch);
WXDLLEXPORT int wxIsalpha(wxChar ch);
#ifdef wxNEED_WX_STRING_H
WXDLLEXPORT wxChar * wxStrcat(wxChar *dest, const wxChar *src);
-WXDLLEXPORT wxChar * wxStrchr(const wxChar *s, wxChar c);
+WXDLLEXPORT const wxChar * wxStrchr(const wxChar *s, wxChar c);
+WXDLLEXPORT 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 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 wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
-WXDLLEXPORT wxChar * wxStrrchr(const wxChar *s, wxChar c);
+WXDLLEXPORT const wxChar * wxStrpbrk(const wxChar *s, const wxChar *accept);
+WXDLLEXPORT 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)
+ { return (wxChar *)wxStrrchr((const wxChar *)s, c); }
WXDLLEXPORT size_t wxStrspn(const wxChar *s, const wxChar *accept);
-WXDLLEXPORT wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
+WXDLLEXPORT const wxChar * wxStrstr(const wxChar *haystack, const wxChar *needle);
+WXDLLEXPORT 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 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);
-WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...);
+WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...) ATTRIBUTE_PRINTF_1;
WXDLLEXPORT int wxVprintf(const wxChar *fmt, va_list argptr);
-WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...);
+WXDLLEXPORT int wxFprintf(FILE *stream, const wxChar *fmt, ...) ATTRIBUTE_PRINTF_2;
WXDLLEXPORT int wxVfprintf(FILE *stream, const wxChar *fmt, va_list argptr);
-WXDLLEXPORT int wxSprintf(wxChar *buf, const wxChar *fmt, ...);
+WXDLLEXPORT int wxSprintf(wxChar *buf, const wxChar *fmt, ...) ATTRIBUTE_PRINTF_2;
WXDLLEXPORT int wxVsprintf(wxChar *buf, const wxChar *fmt, va_list argptr);
-WXDLLEXPORT int wxSscanf(const wxChar *buf, const wxChar *fmt, ...);
+WXDLLEXPORT int wxSscanf(const wxChar *buf, const wxChar *fmt, ...) ATTRIBUTE_PRINTF_2;
WXDLLEXPORT int wxVsscanf(const wxChar *buf, const wxChar *fmt, va_list argptr);
#endif
WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const struct tm *tm);
#endif
+// under VC++ 6.0 isspace() returns 1 for 8 bit chars which completely breaks
+// the file parsing - this may be true for 5.0 as well, update #ifdef then
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200) && !wxUSE_UNICODE
+ #undef wxIsspace
+ #define wxIsspace(c) ((((unsigned)c) < 128) && isspace(c))
+#endif // VC++
+
// ----------------------------------------------------------------------------
// common macros which are always defined
// ----------------------------------------------------------------------------
// and _() in wxWindows sources
#define wxT(x) _T(x)
-// a Unicode-friendly __FILE__ analog
+// Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs
#ifndef __TFILE__
#define __XFILE__(x) wxT(x)
#define __TFILE__ __XFILE__(__FILE__)
#endif
+#ifndef __TDATE__
+ #define __XDATE__(x) wxT(x)
+ #define __TDATE__ __XDATE__(__DATE__)
+#endif
+
+#ifndef __TTIME__
+ #define __XTIME__(x) wxT(x)
+ #define __TTIME__ __XTIME__(__TIME__)
+#endif
+
#endif
//_WX_WXCHAR_H_
projects / wxWidgets.git / blobdiff