new test

[wxWidgets.git] / src / unix / mimetype.cpp

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 0cfb2064803a8ea404b1011e7b3469ea71a8ec0e..0d9de5f65f1fd9a613c427a903ce119bc4e18464 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -152,7 +152,7 @@ protected:
     virtual bool OnRead(const wxMBConv& WXUNUSED(conv))
     {
         return wxTextFile::OnRead(
     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);
 
     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);
     if (mailcapStyles & wxMAILCAP_KDE)
         GetKDEMimeInfo(sExtraDir);

+#endif

 
     m_mailcapStylesInited |= mailcapStyles;
 }
 
     m_mailcapStylesInited |= mailcapStyles;
 }