X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/105260e89ff48167ed02b36fe162ba95375b3dd6..8ba1644391f9fd8fa7f2d2a9c102cd78a1d799cb:/include/wx/wxcrt.h

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index a32b170bbf..99c01b94ea 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -2,7 +2,7 @@
 // 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$
@@ -415,16 +415,16 @@ inline int wxStricmp_String(const wxString& s1, const T& s2)
 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.
-#ifdef __GNUG__
+// 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__)
 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__
+#endif // !__VISUALC__
 
 template<typename T>
 inline int wxStrcoll_String(const wxString& s1, const T& s2)
@@ -440,7 +440,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2)
 #endif
 }
 
-#ifndef __GNUG__
+#if defined(__VISUALC__)
 // this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<>
 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
 #endif
@@ -703,13 +703,6 @@ inline int wxRemove(const wxString& path)
 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);
@@ -831,8 +824,10 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
 
 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
 
@@ -880,21 +875,20 @@ inline size_t wxStrftime(wchar_t *s, size_t max,
 
 // 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); }