#include "wx/wxcrtbase.h"
#include "wx/string.h"
+#if defined (__VISUALC__) || defined (__DMC__)
+ #define HAVE_NO_VSSCANF 1
+#endif
+
// ============================================================================
// misc functions
// ============================================================================
// (including even MSC) inline them just like we do right in their
// headers.
//
-#if wxUSE_UNICODE
- #include <string.h> //for mem funcs
+#include <string.h>
+#if wxUSE_UNICODE
//implement our own wmem variants
inline wxChar* wxTmemchr(const wxChar* s, wxChar c, size_t l)
{
return szRet;
}
-
- // and trivial wrappers for char* versions:
- inline char* wxTmemchr(const char* s, char c, size_t len)
- { return (char*)memchr(s, c, len); }
- inline int wxTmemcmp(const char* sz1, const char* sz2, size_t len)
- { return memcmp(sz1, sz2, len); }
- inline char* wxTmemcpy(char* szOut, const char* szIn, size_t len)
- { return (char*)memcpy(szOut, szIn, len); }
- inline char* wxTmemmove(char* szOut, const char* szIn, size_t len)
- { return (char*)memmove(szOut, szIn, len); }
- inline char* wxTmemset(char* szOut, const char cIn, size_t len)
- { return (char*)memset(szOut, cIn, len); }
-
-#else /* !wxUSE_UNICODE */
- #define wxTmemchr memchr
- #define wxTmemcmp memcmp
- #define wxTmemcpy memcpy
- #define wxTmemmove memmove
- #define wxTmemset memset
-#endif /* wxUSE_UNICODE/!wxUSE_UNICODE */
-
+#endif /* wxUSE_UNICODE */
+
+// provide trivial wrappers for char* versions for both ANSI and Unicode builds
+// (notice that these intentionally return "char *" and not "void *" unlike the
+// standard memxxx() for symmetry with the wide char versions):
+inline char* wxTmemchr(const char* s, char c, size_t len)
+ { return (char*)memchr(s, c, len); }
+inline int wxTmemcmp(const char* sz1, const char* sz2, size_t len)
+ { return memcmp(sz1, sz2, len); }
+inline char* wxTmemcpy(char* szOut, const char* szIn, size_t len)
+ { return (char*)memcpy(szOut, szIn, len); }
+inline char* wxTmemmove(char* szOut, const char* szIn, size_t len)
+ { return (char*)memmove(szOut, szIn, len); }
+inline char* wxTmemset(char* szOut, const char cIn, size_t len)
+ { return (char*)memset(szOut, cIn, len); }
// ============================================================================
// ----------------------------------------------------------------------------
// NB: we can't provide const wchar_t* (= wxChar*) overload, because calling
-// wxSetlocale(category, NULL) -- which is a common thing to do --would be
+// wxSetlocale(category, NULL) -- which is a common thing to do -- would be
// ambiguous
WXDLLIMPEXP_BASE char* wxSetlocale(int category, const char *locale);
inline char* wxSetlocale(int category, const wxCharBuffer& locale)
{ return s1.CmpNoCase(s2); }
WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
+#if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW)
// GCC 3.3 and other compilers have a bug that causes it to fail compilation if
// the template's implementation uses overloaded function declared later (see
// the wxStrcoll() call in wxStrcoll_String<T>()), so we have to
// forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH,
-// this fails to compile with VC6, so don't do it for VC.
-#if !defined(__VISUALC__)
+// this fails to compile with VC6, so don't do it for VC. It also causes
+// problems with GCC visibility in newer GCC versions.
+#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4))
template<typename T>
inline int wxStrcoll_String(const wxString& s1, const T& s2);
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif
}
-#if defined(__VISUALC__)
+#if defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4)
// this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<>
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif
+#endif // defined(wxCRT_Strcoll[AW])
template<typename T>
inline int wxStrspn_String(const wxString& s1, const T& s2)
#undef WX_STR_FUNC
#undef WX_STR_FUNC_NO_INVERT
+#if defined(wxCRT_StrxfrmA) && defined(wxCRT_StrxfrmW)
+
inline size_t wxStrxfrm(char *dest, const char *src, size_t n)
{ return wxCRT_StrxfrmA(dest, src, n); }
inline size_t wxStrxfrm(wchar_t *dest, const wchar_t *src, size_t n)
inline size_t wxStrxfrm(wchar_t *dest, const wxCStrData& src, size_t n)
{ return wxCRT_StrxfrmW(dest, src.AsWCharBuf(), n); }
+#endif // defined(wxCRT_Strxfrm[AW])
+
inline char *wxStrtok(char *str, const char *delim, char **saveptr)
{ return wxCRT_StrtokA(str, delim, saveptr); }
inline wchar_t *wxStrtok(wchar_t *str, const wchar_t *delim, wchar_t **saveptr)
// to be ever used, but it still has to compile).
template<typename T> struct wxStrtoxCharType {};
template<> struct wxStrtoxCharType<char**>
- { typedef const char* Type; };
+{
+ typedef const char* Type;
+ static char** AsPointer(char **p) { return p; }
+};
template<> struct wxStrtoxCharType<wchar_t**>
- { typedef const wchar_t* Type; };
+{
+ typedef const wchar_t* Type;
+ static wchar_t** AsPointer(wchar_t **p) { return p; }
+};
template<> struct wxStrtoxCharType<int>
- { typedef const char* Type; /* this one is never used */ };
+{
+ typedef const char* Type; /* this one is never used */
+ static char** AsPointer(int WXUNUSED_UNLESS_DEBUG(p))
+ {
+ wxASSERT_MSG( p == 0, "passing non-NULL int is invalid" );
+ return NULL;
+ }
+};
template<typename T>
inline double wxStrtod(const wxString& nptr, T endptr)
// note that it is important to use c_str() here and not mb_str() or
// wc_str(), because we store the pointer into (possibly converted)
// buffer in endptr and so it must be valid even when wxStrtod() returns
- return wxStrtod((typename wxStrtoxCharType<T>::Type)nptr.c_str(), endptr);
+ typedef typename wxStrtoxCharType<T>::Type CharType;
+ return wxStrtod((CharType)nptr.c_str(),
+ wxStrtoxCharType<T>::AsPointer(endptr));
}
}
template<typename T>
if ( endptr == 0 ) \
return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \
else \
- return name((typename wxStrtoxCharType<T>::Type)nptr.c_str(), \
- endptr, base); \
+ { \
+ typedef typename wxStrtoxCharType<T>::Type CharType; \
+ return name((CharType)nptr.c_str(), \
+ wxStrtoxCharType<T>::AsPointer(endptr), \
+ base); \
+ } \
} \
template<typename T> \
inline rettype name(const wxCStrData& nptr, T endptr, int base) \
#undef WX_STRTOX_FUNC
+// there is no command interpreter under CE, hence no system()
+#ifndef __WXWINCE__
+
// mingw32 doesn't provide _tsystem() even though it provides other stdlib.h
// functions in their wide versions
#ifdef wxCRT_SystemW
inline int wxSystem(const wxString& str) { return wxCRT_SystemA(str.mb_str()); }
#endif
+#endif // !__WXWINCE__/__WXWINCE__
+
inline char* wxGetenv(const char *name) { return wxCRT_GetenvA(name); }
inline wchar_t* wxGetenv(const wchar_t *name) { return wxCRT_GetenvW(name); }
inline char* wxGetenv(const wxString& name) { return wxCRT_GetenvA(name.mb_str()); }
inline char* wxGetenv(const wxCharBuffer& name) { return wxCRT_GetenvA(name.data()); }
inline wchar_t* wxGetenv(const wxWCharBuffer& name) { return wxCRT_GetenvW(name.data()); }
-
// ----------------------------------------------------------------------------
// time.h functions
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff