X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/961326054fcf39eaa56137aa034d4614ead64dd2..c5d7b7d20ba810df4ad66f6826c529a106e81577:/include/wx/strconv.h diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 0847360a8f..25ce7a0fb6 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -29,8 +29,6 @@ #include #endif // ! __WXPALMOS5__ -#if wxUSE_WCHAR_T - class WXDLLIMPEXP_FWD_BASE wxString; // the error value returned by wxMBConv methods @@ -643,33 +641,6 @@ extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvUI; #define wxFNSTRINGCAST WXSTRINGCAST #endif -#else // !wxUSE_WCHAR_T - -// ---------------------------------------------------------------------------- -// stand-ins in absence of wchar_t -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxMBConv -{ -public: - const char* cMB2WX(const char *psz) const { return psz; } - const char* cWX2MB(const char *psz) const { return psz; } -}; - -#define wxConvFile wxConvLocal - -extern WXDLLIMPEXP_DATA_BASE(wxMBConv) wxConvLibc, - wxConvLocal, - wxConvISO8859_1, - wxConvUTF8; -extern WXDLLIMPEXP_DATA_BASE(wxMBConv *) wxConvCurrent; - -#define wxFNCONV(name) name -#define wxFNSTRINGCAST WXSTRINGCAST - -#endif - // wxUSE_WCHAR_T - // ---------------------------------------------------------------------------- // macros for the most common conversions // ----------------------------------------------------------------------------