A few tweaks and cleanups

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

diff --git a/include/wx/strconv.h b/include/wx/strconv.h
index fa3e22c42dd9fec88baa7f1ddf6cd4bb272338c9..a329062f5cf37bcb6515cfe1496f93676c34f6a2 100644 (file)
--- a/include/wx/strconv.h
+++ b/include/wx/strconv.h
@@ -23,6 +23,7 @@
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 #  undef __BSEXCPT__
 #endif
+
 #include <stdlib.h>
 
 #if wxUSE_WCHAR_T
@@ -46,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; }
@@ -130,9 +131,13 @@ public:
     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;