Updated version to 2.3.2 so apps can test for differences in new merged source

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index b2a2ee51f0d6676f2a8e883996ba9a1f91e11afa..2332dc12ac3d429811247d8fbd8eb6e11012e5cb 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -79,6 +79,11 @@
 // other standard headers
 #include <ctype.h>
 
+#ifdef __VMS
+/* silence warnings for comparing unsigned int's <0 */
+# pragma message disable unscomzer
+#endif
+
 // this is a class to extend wxArrayString...
 class wxMimeArrayString : public wxArrayString
 {
@@ -294,10 +299,13 @@ static bool IsKnownUnimportantField(const wxString& field);
 //  a) for "brief" format:
 //      <mime type>  <space separated list of extensions>
 //  b) for "expanded" format:
-//      type=<mime type> \ 
-//      desc="<description>" \ 
+//      type=<mime type> BACKSLASH
+//      desc="<description>" BACKSLASH
 //      exts="<comma separated list of extensions>"
 //
+// (where BACKSLASH is a literal '\\' which we can't put here because cpp
+// misinterprets it)
+//
 // We try to autodetect the format of mime.types: if a non-comment line starts
 // with "type=" we assume the second format, otherwise the first one.
 
@@ -1105,17 +1113,19 @@ wxString wxFileTypeImpl::GetExpandedCommand(const wxString & verb, const wxFileT
     return wxFileType::ExpandCommand(sTmp, params);
 }
 
-bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString *iconFile /*= NULL */,
-                 int *iconIndex /*= NULL*/) const
+bool wxFileTypeImpl::GetIcon(wxIcon *icon,
+                             wxString *iconFile /*= NULL */,
+                             int *iconIndex /*= NULL*/) const
 
 {
+#if wxUSE_GUI
     wxString sTmp;
     size_t i = 0;
     while ( (i < m_index.GetCount() ) && sTmp.IsEmpty() )
-        {
-            sTmp = m_manager->m_aIcons[m_index[i]];
-            i ++;
-        }
+    {
+        sTmp = m_manager->m_aIcons[m_index[i]];
+        i ++;
+    }
     if ( sTmp.IsEmpty () ) return FALSE;
 
     wxIcon icn;
@@ -1126,14 +1136,16 @@ bool wxFileTypeImpl::GetIcon(wxIcon *icon, wxString *iconFile /*= NULL */,
         icn = wxIcon(sTmp, wxBITMAP_TYPE_ANY);
 
     if ( icn.Ok() )
-      {
-      *icon = icn;
-      if (iconFile) *iconFile = sTmp;
-      if (iconIndex) *iconIndex = 0;
-      return TRUE;
-      }
-        return FALSE;
+    {
+        *icon = icn;
+        if (iconFile) *iconFile = sTmp;
+        if (iconIndex) *iconIndex = 0;
+        return TRUE;
     }
+#endif // wxUSE_GUI
+
+    return FALSE;
+}
 
 
 bool
@@ -2194,7 +2206,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
         // the flags and field values on the current line
         bool needsterminal = FALSE,
              copiousoutput = FALSE;
-        wxMimeArrayString *entry;
+        wxMimeArrayString *entry = NULL; // suppress compiler warning
 
         wxString strType,
                  strOpenCmd,