/*
* Name: wx/wxchar.h
* Purpose: Declarations common to wx char/wchar_t usage (wide chars)
- * Author: Joel Farley, Ove Kåven
+ * Author: Joel Farley, Ove K�en
* Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee
* Created: 1998/06/12
* RCS-ID: $Id$
- * Copyright: (c) 1998-2002 Joel Farley, Ove Kåven, Robert Roebling, Ron Lee
+ * Copyright: (c) 1998-2002 Joel Farley, Ove K�en, Robert Roebling, Ron Lee
* Licence: wxWindows licence
*/
#ifndef _WX_WXCHAR_H_
#define _WX_WXCHAR_H_
-#include "wx/defs.h" /* for wxUSE_UNICODE */
+/* defs.h indirectly includes this file, so don't include it here */
+#include "wx/platform.h"
+#include "wx/dlimpexp.h"
#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 **);
/*
Standard headers we need here.
- NB: don't include any wxWidgets 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
/* 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__) || \
#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) */
/* and _() in wxWidgets sources */
#define wxT(x) _T(x)
+/* a helper macro allowing to make another macro Unicode-friendly, see below */
+#define wxAPPLY_T(x) _T(x)
+
/* Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs */
#ifndef __TFILE__
- #define __XFILE__(x) wxT(x)
- #define __TFILE__ __XFILE__(__FILE__)
+ #define __TFILE__ wxAPPLY_T(__FILE__)
#endif
#ifndef __TDATE__
- #define __XDATE__(x) wxT(x)
- #define __TDATE__ __XDATE__(__DATE__)
+ #define __TDATE__ wxAPPLY_T(__DATE__)
#endif
#ifndef __TTIME__
- #define __XTIME__(x) wxT(x)
- #define __TTIME__ __XTIME__(__TIME__)
+ #define __TTIME__ wxAPPLY_T(__TIME__)
#endif
/*
/* special case: not all TCHAR-aware compilers have those */
#if defined(__VISUALC__) || \
(defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
- #define wxVsnprintf_ _vsntprintf
- #define wxSnprintf_ _sntprintf
+ /*
+ we can only use the system _vsntprintf() if we don't require the
+ Unix98 positional parameters support as it doesn't have it
+ */
+ #if !wxUSE_PRINTF_POS_PARAMS
+ #define wxVsnprintf_ _vsntprintf
+ #define wxSnprintf_ _sntprintf
+ #endif
#endif
/* special case: these functions are missing under Win9x with Unicows so we */
#define wxWcstombs wcstombs
#endif
- /* No UNICODE in the c library except wchar_t typedef on mac OSX 10.2 and less - roll our own */
- #if !defined(__MWERKS__) && wxUSE_UNICODE && defined(__DARWIN__) && ( MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_2 )
-
+ /*
+ 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
We define function with a trailing underscore here because the real one is a
wrapper around it as explained below
*/
-#ifndef wxVsnprintf_
+#if !defined( wxVsnprintf_ ) && !wxUSE_PRINTF_POS_PARAMS
#if wxUSE_UNICODE
#ifdef wxHAVE_MWERKS_UNICODE
#define HAVE_WCSRTOMBS 1
#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 wxWidgets apparently have */
/* both snprintf() and vsnprintf() */
- #if defined(HAVE_SNPRINTF) || defined(__MWERKS__) || defined(__WATCOMC__)
+ #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__)
+ #if defined(HAVE_VSNPRINTF) \
+ || defined(__MWERKS__) || defined(__WATCOMC__)
+ #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 && !wxUSE_PRINTF_POS_PARAMS */
+
+#if !defined( wxVsnprintf_ ) && wxUSE_PRINTF_POS_PARAMS
+ /*
+ The systems where vsnprintf() supports positionals should define
+ the HAVE_UNIX98_PRINTF symbol.
+
+ On systems which don't (e.g. Windows) we are forced to use
+ our wxVsnprintf() implementation.
+ */
+ #if defined(HAVE_UNIX98_PRINTF)
+ #if wxUSE_UNICODE
+ #define wxVsnprintf_ vswprintf
+ #else /* ASCII */
#if defined __cplusplus && defined HAVE_BROKEN_VSNPRINTF_DECL
#define wxVsnprintf_ wx_fixed_vsnprintf
#else
#define wxVsnprintf_ vsnprintf
#endif
#endif
+ #else
+ // the only exception on Windows is VC++ 8.0; it provides a new family
+ // of printf() functions with positional parameter support which should
+ // behave mostly identic to our wxVsnprintf() implementation
+ #if defined(__VISUALC__) && __VISUALC__ >= 1400
+ #if wxUSE_UNICODE
+ #define wxVsnprintf_ _vsprintf_p
+ #else
+ #define wxVsnprintf_ _vswprintf_p
+ #endif
+ #endif
#endif
-#endif /* wxVsnprintf_ not defined yet */
+#endif // !defined( wxVsnprintf_ ) && wxUSE_PRINTF_POS_PARAMS
#ifndef wxSnprintf_
/* no [v]snprintf(), cook our own */
projects / wxWidgets.git / blobdiff