X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9bbb2d877071a8febecfdf77c06bcea868c4c16..655c20fcd5a554a986b93651d8b0bec2afde8573:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index deb9fb624a..0d9de5f65f 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -149,10 +149,10 @@ protected: // single conversion in Unicode build, so we just try to read what we can // suing the most common encoding (UTF-8 is almost ubiquitous nowadays) and // ignore the rest - virtual bool OnRead(const wxMBConv& conv) + virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) { return wxTextFile::OnRead( - wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)); + wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA)); } }; @@ -1512,9 +1512,11 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, if (mailcapStyles & wxMAILCAP_GNOME) GetGnomeMimeInfo(sExtraDir); - // read KDE tables + // read KDE tables which are never installed on OpenVMS +#ifndef __VMS if (mailcapStyles & wxMAILCAP_KDE) GetKDEMimeInfo(sExtraDir); +#endif m_mailcapStylesInited |= mailcapStyles; }