don't add wxVSCROLL if only wxHSCROLL is explicitly specified (and vice versa), only...

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 7da4abbd51dd8d4c355c137959f2e8ea93c4c885..9aa4adaf07e89b71778203c43c9036a59f1c2dc5 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -68,17 +68,23 @@
 // other standard headers
 #include <ctype.h>
 
 // other standard headers
 #include <ctype.h>
 

-// this class extends wxTextFile
+// this class is a wxTextFile specialization for dealing with files storing
+// various MIME-related information

 //
 //

-// VZ: ???
+// it should be used instead of wxTextFile even if none of its additional
+// methods are used just because it handles files with mixed encodings (often
+// the case for MIME files which contain strings for different languages)
+// correctly, see OnRead()

 class wxMimeTextFile : public wxTextFile
 {
 public:
     // constructors
 class wxMimeTextFile : public wxTextFile
 {
 public:
     // constructors

-    wxMimeTextFile () : wxTextFile () {};
-    wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) {};
+    wxMimeTextFile () : wxTextFile () { }
+    wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) { }

 
 

-    int pIndexOf(const wxString & sSearch, bool bIncludeComments = false, int iStart = 0)
+    int pIndexOf(const wxString& sSearch,
+                 bool bIncludeComments = false,
+                 int iStart = 0)

     {
         wxString sTest = sSearch;
         sTest.MakeLower();
     {
         wxString sTest = sSearch;
         sTest.MakeLower();


@@ -135,6 +141,19 @@ public:
         wxString sTmp = GetLine(i).AfterFirst(wxT('='));
         return sTmp;
     }
         wxString sTmp = GetLine(i).AfterFirst(wxT('='));
         return sTmp;
     }

+
+protected:
+    // we override this virtual method because we want to always use UTF-8
+    // conversion allowing for invalid characters as MIME information files
+    // often contain lines in different encodings and can't be read using any
+    // 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& WXUNUSED(conv))
+    {
+        return wxTextFile::OnRead(
+                    wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA));
+    }

 };
 
 // in case we're compiling in non-GUI mode
 };
 
 // in case we're compiling in non-GUI mode


@@ -255,12 +274,8 @@ static bool IsKnownUnimportantField(const wxString& field);
 void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
                                                       const wxArrayString& dirs)
 {
 void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
                                                       const wxArrayString& dirs)
 {

-    wxTextFile textfile(filename);
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-    if ( !textfile.Open(wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)) )
-#else
+    wxMimeTextFile textfile(filename);

     if ( !textfile.Open() )
     if ( !textfile.Open() )

-#endif

         return;
 
     wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s  ---"),
         return;
 
     wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s  ---"),


@@ -399,7 +414,7 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
 
 void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename)
 {
 
 void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename)
 {

-    wxTextFile textfile(filename);
+    wxMimeTextFile textfile(filename);

     if ( !textfile.Open() )
         return;
 
     if ( !textfile.Open() )
         return;
 


@@ -749,17 +764,13 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
                                                const wxArrayString& icondirs)
 {
     wxFileName fullname(dirbase, filename);
                                                const wxArrayString& icondirs)
 {
     wxFileName fullname(dirbase, filename);

-    wxMimeTextFile file;
-    {
-        wxLogNull logNull;
-        if ( !file.Open(fullname.GetFullPath()) )
-            if ( !file.Open(fullname.GetFullPath(), wxConvISO8859_1) )
-                return;
-    }
-

     wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),
                            fullname.GetFullPath().c_str());
 
     wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"),
                            fullname.GetFullPath().c_str());
 

+    wxMimeTextFile file;
+    if ( !file.Open(fullname.GetFullPath()) )
+        return;
+

     wxMimeTypeCommands * entry = new wxMimeTypeCommands;
     wxArrayString sExts;
     wxString mimetype, mime_desc, strIcon;
     wxMimeTypeCommands * entry = new wxMimeTypeCommands;
     wxArrayString sExts;
     wxString mimetype, mime_desc, strIcon;


@@ -939,17 +950,12 @@ void wxMimeTypesManagerImpl::LoadKDELinkFilesFromDir(const wxString& dirname,
 // Read a KDE .desktop file of type 'Application'
 void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename)
 {
 // Read a KDE .desktop file of type 'Application'
 void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename)
 {

-    wxMimeTextFile file;
-
-    {
-        wxLogNull logNull;
-        if ( !file.Open(filename) )
-            if ( !file.Open(filename, wxConvISO8859_1) )
-                return;
-    }
-

     wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), filename.c_str());
 
     wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), filename.c_str());
 

+    wxMimeTextFile file;
+    if ( !file.Open(filename) )
+        return;
+

     // Here, only type 'Application' should be considered.
     int nIndex = file.pIndexOf( wxT("Type=") );
     if (nIndex != wxNOT_FOUND &&
     // Here, only type 'Application' should be considered.
     int nIndex = file.pIndexOf( wxT("Type=") );
     if (nIndex != wxNOT_FOUND &&


@@ -1086,13 +1092,17 @@ static wxString ReadPathFromKDEConfig(const wxString& request)
 static wxString GetKDEThemeInFile(const wxFileName& filename)
 {
     wxString theme;
 static wxString GetKDEThemeInFile(const wxFileName& filename)
 {
     wxString theme;

-    wxTextFile config;
-    if(filename.FileExists() && config.Open( filename.GetFullPath() )) {
+    wxMimeTextFile config;
+    if ( filename.FileExists() && config.Open(filename.GetFullPath()) )
+    {

         size_t cnt = config.GetLineCount();
         size_t cnt = config.GetLineCount();

-        for(size_t i = 0; i < cnt; i++)
-            if(config[i].StartsWith(wxT("Theme="), &theme))
+        for ( size_t i = 0; i < cnt; i++ )
+        {
+            if ( config[i].StartsWith(wxT("Theme="), &theme) )

                 break;
                 break;

+        }

     }
     }

+

     return theme;
 }
 
     return theme;
 }
 


@@ -1502,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;
 }


@@ -2246,12 +2258,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName)
     wxLogTrace(TRACE_MIME, wxT("--- Parsing mime.types file '%s' ---"),
                strFileName.c_str());
 
     wxLogTrace(TRACE_MIME, wxT("--- Parsing mime.types file '%s' ---"),
                strFileName.c_str());
 

-    wxTextFile file(strFileName);
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-    if ( !file.Open(wxConvUTF8) )
-#else
+    wxMimeTextFile file(strFileName);

     if ( !file.Open() )
     if ( !file.Open() )

-#endif

         return false;
 
     // the information we extract
         return false;
 
     // the information we extract


@@ -2543,12 +2551,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
     wxLogTrace(TRACE_MIME, wxT("--- Parsing mailcap file '%s' ---"),
                strFileName.c_str());
 
     wxLogTrace(TRACE_MIME, wxT("--- Parsing mailcap file '%s' ---"),
                strFileName.c_str());
 

-    wxTextFile file(strFileName);
-#if defined(__WXGTK20__) && wxUSE_UNICODE
-    if ( !file.Open(wxConvUTF8) )
-#else
+    wxMimeTextFile file(strFileName);

     if ( !file.Open() )
     if ( !file.Open() )

-#endif

         return false;
 
     // indices of MIME types (in m_aTypes) we already found in this file
         return false;
 
     // indices of MIME types (in m_aTypes) we already found in this file


@@ -2743,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() )