Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index 97239009c42a3a5e8a762a385b31b68f46254937..81015e32403888b8cf031b547e9741283b4c97fe 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -20,6 +20,10 @@
 #include "wx/wxchar.h"
 #include "wx/buffer.h"
 
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+#  undef __BSEXCPT__
+#endif
+
 #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 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; }
@@ -120,16 +124,23 @@ class WXDLLEXPORT wxCSConv : public wxMBConv
 {
 public:
     wxCSConv(const wxChar *charset);
+    wxCSConv(const wxCSConv& conv);
     virtual ~wxCSConv();
 
+    wxCSConv& operator=(const wxCSConv& conv);
+    
     void LoadNow();
 
     virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const;
     virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
 
+    void Clear() ;
+
 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;
@@ -149,7 +160,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