fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig...

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 2b76ae98591480918d7617c682d9c066ff2e1fae..9ed3790af0b00e53cae7aa11be224e6e07b956e2 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,6 +20,10 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 

+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+#  undef __BSEXCPT__
+#endif
+

 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T
 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T


@@ -43,7 +47,7 @@ public:
     const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); }
     const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); }
     const wchar_t* cWC2WX(const wchar_t *psz) const { return psz; }
     const wxWCharBuffer cMB2WX(const char *psz) const { return cMB2WC(psz); }
     const wxCharBuffer cWX2MB(const wchar_t *psz) const { return cWC2MB(psz); }
     const wchar_t* cWC2WX(const wchar_t *psz) const { return psz; }

-    const wchar_t* cMB2WC(const wchar_t *psz) const { return psz; }
+    const wchar_t* cWX2WC(const wchar_t *psz) const { return psz; }

 #else // ANSI
     const char* cMB2WX(const char *psz) const { return psz; }
     const char* cWX2MB(const char *psz) const { return psz; }
 #else // ANSI
     const char* cMB2WX(const char *psz) const { return psz; }
     const char* cWX2MB(const char *psz) const { return psz; }


@@ -130,6 +134,8 @@ public:
 private:
     void SetName(const wxChar *charset);
 
 private:
     void SetName(const wxChar *charset);
 

+    // note that we can't use wxString here because of compilation
+    // dependencies: we're included from wx/string.h

     wxChar *m_name;
     wxCharacterSet *m_cset;
     bool m_deferred;
     wxChar *m_name;
     wxCharacterSet *m_cset;
     bool m_deferred;