X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5576edf8d8abf87473eb6646346b8acd380d09a7..0cc970b3db1c7390bec36e612b1fcc657bd06a8c:/include/wx/strconv.h?ds=inline diff --git a/include/wx/strconv.h b/include/wx/strconv.h index 2d82151481..6919583e8d 100644 --- a/include/wx/strconv.h +++ b/include/wx/strconv.h @@ -98,7 +98,7 @@ public: class WXDLLIMPEXP_BASE wxConvBrokenFileNames : public wxMBConv { public: - wxConvBrokenFileNames(); + wxConvBrokenFileNames(const wxChar *charset); virtual ~wxConvBrokenFileNames() { delete m_conv; } virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const; @@ -236,30 +236,6 @@ private: bool m_deferred; }; -#ifdef __UNIX__ - -// ---------------------------------------------------------------------------- -// wxConvBrokenFileNames is made for GTK2 in Unicode mode when -// files are accidentally written in an encoding which is not -// the system encoding. Typically, the system encoding will be -// UTF8 but there might be files stored in ISO8859-1 on disk. -// ---------------------------------------------------------------------------- - -class wxConvBrokenFileNames : public wxMBConv -{ -public: - wxConvBrokenFileNames(); - virtual ~wxConvBrokenFileNames() { delete m_conv; } - - virtual size_t MB2WC(wchar_t *outputBuf, const char *psz, size_t outputSize) const; - virtual size_t WC2MB(char *outputBuf, const wchar_t *psz, size_t outputSize) const; - -private: - // the conversion object we forward to - wxMBConv *m_conv; -}; -#endif -// __UNIX__ // ---------------------------------------------------------------------------- // declare predefined conversion objects