implement Set/GetTitle() (last part of patch 1679337)

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index deb9fb624a9ee27d6d81ab8a03f10e49d9a45edb..9aa4adaf07e89b71778203c43c9036a59f1c2dc5 100644 (file)
--- 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
     // 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(
     {
         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;
 }


@@ -2745,8 +2747,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
 
         if ( data.needsterminal )
         {
 
         if ( data.needsterminal )
         {

-            data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"),
-                                            data.cmdOpen.c_str());
+            data.cmdOpen.insert(0, wxT("xterm -e sh -c '"));
+            data.cmdOpen.append(wxT("'"));

         }
 
         if ( !data.cmdOpen.empty() )
         }
 
         if ( !data.cmdOpen.empty() )