cWX2MB and cMB2WX should be available even when without wchar_t.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index 2ad17f489604a4b8a40258e93c49ef66e1d33487..613d6db147a6b1302c5a42ade025e5f37cd35e00 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -263,7 +263,10 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
 #define FNSTRINGCAST WXSTRINGCAST
 #endif
 #else//!wxUSE_WCHAR_T
 #define FNSTRINGCAST WXSTRINGCAST
 #endif
 #else//!wxUSE_WCHAR_T

-class WXDLLEXPORT wxMBConv {};
+class WXDLLEXPORT wxMBConv {
+  const char* cMB2WX(const char *psz) const { return psz; }
+  const char* cWX2MB(const char *psz) const { return psz; }
+};

 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
 #define wxConv_libc wxConvLibc
 #define wxConv_file wxConvFile
 WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
 #define wxConv_libc wxConvLibc
 #define wxConv_file wxConvFile