moved bookmarks to Contents panel

[wxWidgets.git] / include / wx / strconv.h

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 97239009c42a3a5e8a762a385b31b68f46254937..fa3e22c42dd9fec88baa7f1ddf6cd4bb272338c9 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,6 +20,9 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+#  undef __BSEXCPT__
+#endif
 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T
@@ -149,7 +152,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
     #define wxMBFILES 0
 #endif
 
-#if wxMBFILES
+#if wxMBFILES && wxUSE_UNICODE
     #define wxFNCONV(name) wxConvFile.cWX2MB(name)
     #define wxFNSTRINGCAST wxMBSTRINGCAST
 #else