X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5438a5665e35ee6286c5af73747873df9daed252..43a997b6e2064a189fa73ca1816908fb740ce297:/src/common/mimecmn.cpp?ds=sidebyside

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 8a16ced893..ec2f6695a4 100644
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -328,6 +328,18 @@ wxFileType::GetOpenCommand(wxString *openCmd,
     return m_impl->GetOpenCommand(openCmd, params);
 }
 
+wxString wxFileType::GetOpenCommand(const wxString& filename) const
+{
+    wxString cmd;
+    if ( !GetOpenCommand(&cmd, filename) )
+    {
+        // return empty string to indicate an error
+        cmd.clear();
+    }
+
+    return cmd;
+}
+
 bool
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
@@ -474,7 +486,7 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
     return m_impl->Unassociate(ft);
 #else
     return ft->Unassociate();
@@ -584,7 +596,7 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {
-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);
@@ -597,7 +609,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle,
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {
-#if defined(__UNIX__) && !defined(__WXPM__)
+#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__)
     EnsureImpl();
 
     m_impl->ClearData();
@@ -626,6 +638,7 @@ public:
         {
             delete gs_mimeTypesManager.m_impl;
             gs_mimeTypesManager.m_impl = NULL;
+            gs_mimeTypesManager.m_fallbacks.Clear();
         }
     }