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

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index a32b170bbf..49b5b2ca42 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -420,11 +420,12 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
 // 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__
+// The same is needed for HP CXX on OpenVMS 
+#if defined( __GNUG__ ) || defined( __VMS )
 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 // __GNUG__ or __VMS
 
 template<typename T>
 inline int wxStrcoll_String(const wxString& s1, const T& s2)
@@ -440,7 +441,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2)
 #endif
 }
 
-#ifndef __GNUG__
+#if !defined( __GNUG__ ) && !defined( __VMS )
 // this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<>
 WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
 #endif
@@ -880,21 +881,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); }