// Name: wx/wxcrt.h
// Purpose: Type-safe ANSI and Unicode builds compatible wrappers for
// CRT functions
-// Author: Joel Farley, Ove Kåven
+// Author: Joel Farley, Ove K�ven
// Modified by: Vadim Zeitlin, Robert Roebling, Ron Lee, Vaclav Slavik
// Created: 1998/06/12
// RCS-ID: $Id$
WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
-// GCC 3.3 has 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 we do it for GCC only.
-// The same is needed for HP CXX on OpenVMS
-#if defined( __GNUG__ ) || defined( __VMS )
+// 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. 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 // __GNUG__ or __VMS
+#endif // !__VISUALC__
template<typename T>
inline int wxStrcoll_String(const wxString& s1, const T& s2)
#endif
}
-#if !defined( __GNUG__ ) && !defined( __VMS )
+#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
inline int wxRename(const wxString& oldpath, const wxString& newpath)
{ return wxCRT_Rename(oldpath.fn_str(), newpath.fn_str()); }
-// NB: we don't provide wxString/wxCStrData versions of wxTmpnam, because 's'
-// is writable
-inline char *wxTmpnam(char *s)
- { return wxCRT_TmpnamA(s); }
-inline wchar_t *wxTmpnam(wchar_t *s)
- { return wxCRT_TmpnamW(s); }
-
extern WXDLLIMPEXP_BASE int wxPuts(const wxString& s);
extern WXDLLIMPEXP_BASE int wxFputs(const wxString& s, FILE *stream);
extern WXDLLIMPEXP_BASE void wxPerror(const wxString& s);
// 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) \
WX_STRTOX_FUNC(long, wxStrtol, wxCRT_StrtolA, wxCRT_StrtolW)
WX_STRTOX_FUNC(unsigned long, wxStrtoul, wxCRT_StrtoulA, wxCRT_StrtoulW)
+#ifdef wxLongLong_t
WX_STRTOX_FUNC(wxLongLong_t, wxStrtoll, wxCRT_StrtollA, wxCRT_StrtollW)
WX_STRTOX_FUNC(wxULongLong_t, wxStrtoull, wxCRT_StrtoullA, wxCRT_StrtoullW)
+#endif // wxLongLong_t
#undef WX_STRTOX_FUNC
// FIXME-UTF8: we'd be better off implementing these ourselves, as the CRT
// version is locale-dependent
-// FIXME-UTF8: should we return bool from these instead of int?
// FIXME-UTF8: these don't work when EOF is passed in because of wxUniChar,
// is this OK or not?
-inline int wxIsalnum(const wxUniChar& c) { return wxCRT_IsalnumW(c); }
-inline int wxIsalpha(const wxUniChar& c) { return wxCRT_IsalphaW(c); }
-inline int wxIscntrl(const wxUniChar& c) { return wxCRT_IscntrlW(c); }
-inline int wxIsdigit(const wxUniChar& c) { return wxCRT_IsdigitW(c); }
-inline int wxIsgraph(const wxUniChar& c) { return wxCRT_IsgraphW(c); }
-inline int wxIslower(const wxUniChar& c) { return wxCRT_IslowerW(c); }
-inline int wxIsprint(const wxUniChar& c) { return wxCRT_IsprintW(c); }
-inline int wxIspunct(const wxUniChar& c) { return wxCRT_IspunctW(c); }
-inline int wxIsspace(const wxUniChar& c) { return wxCRT_IsspaceW(c); }
-inline int wxIsupper(const wxUniChar& c) { return wxCRT_IsupperW(c); }
-inline int wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c); }
+inline bool wxIsalnum(const wxUniChar& c) { return wxCRT_IsalnumW(c) != 0; }
+inline bool wxIsalpha(const wxUniChar& c) { return wxCRT_IsalphaW(c) != 0; }
+inline bool wxIscntrl(const wxUniChar& c) { return wxCRT_IscntrlW(c) != 0; }
+inline bool wxIsdigit(const wxUniChar& c) { return wxCRT_IsdigitW(c) != 0; }
+inline bool wxIsgraph(const wxUniChar& c) { return wxCRT_IsgraphW(c) != 0; }
+inline bool wxIslower(const wxUniChar& c) { return wxCRT_IslowerW(c) != 0; }
+inline bool wxIsprint(const wxUniChar& c) { return wxCRT_IsprintW(c) != 0; }
+inline bool wxIspunct(const wxUniChar& c) { return wxCRT_IspunctW(c) != 0; }
+inline bool wxIsspace(const wxUniChar& c) { return wxCRT_IsspaceW(c) != 0; }
+inline bool wxIsupper(const wxUniChar& c) { return wxCRT_IsupperW(c) != 0; }
+inline bool wxIsxdigit(const wxUniChar& c) { return wxCRT_IsxdigitW(c) != 0; }
inline wxUniChar wxTolower(const wxUniChar& c) { return wxCRT_TolowerW(c); }
inline wxUniChar wxToupper(const wxUniChar& c) { return wxCRT_ToupperW(c); }
projects / wxWidgets.git / blobdiff