removed extra wxSTD

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 62487d68ea4bf2a9302f1858d4cb96e8c94d87c0..6693d5bd8887f1c012d43e8d8c60ee3ba6f9e90b 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -79,6 +79,11 @@
 // other standard headers
 #include <ctype.h>
 
 // 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
 {
 // 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:
 //  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>"
 //
 //      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.
 
 // 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);
 }
 
     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() )
     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;
     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() )
         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
 
 
 bool


@@ -1291,7 +1303,8 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles,
                                         const wxString& sExtraDir)
 {
     // read mimecap amd mime.types
                                         const wxString& sExtraDir)
 {
     // read mimecap amd mime.types

-    if ( (mailcapStyles & wxMAILCAP_NETSCAPE) || (mailcapStyles & wxMAILCAP_BASE) )
+    if ( (mailcapStyles & wxMAILCAP_NETSCAPE) ||
+         (mailcapStyles & wxMAILCAP_STANDARD) )

         GetMimeInfo(sExtraDir);
 
     // read GNOME tables
         GetMimeInfo(sExtraDir);
 
     // read GNOME tables


@@ -1375,7 +1388,7 @@ void wxMimeTypesManagerImpl::GetMimeInfo (const wxString& sExtraDir)
 bool wxMimeTypesManagerImpl::WriteToMimeTypes (int index, bool delete_index)
 {
     // check we have the right manager
 bool wxMimeTypesManagerImpl::WriteToMimeTypes (int index, bool delete_index)
 {
     // check we have the right manager

-    if (! ( m_mailcapStylesInited & wxMAILCAP_BASE) )
+    if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD) )

         return FALSE;
 
     bool bTemp;
         return FALSE;
 
     bool bTemp;


@@ -1517,7 +1530,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap (int index, bool delete_index)
 {
     //check we have the right managers
     if ( !( ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE) ||
 {
     //check we have the right managers
     if ( !( ( m_mailcapStylesInited & wxMAILCAP_NETSCAPE) ||

-            ( m_mailcapStylesInited & wxMAILCAP_BASE) ) )
+            ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) )

         return FALSE;
 
     bool bTemp;
         return FALSE;
 
     bool bTemp;


@@ -1568,7 +1581,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap (int index, bool delete_index)
         sTmp = sTmp + wxT(";") + sCmd ; //includes wxT(" %s ");
 
         // write it in the format that Netscape uses (default)
         sTmp = sTmp + wxT(";") + sCmd ; //includes wxT(" %s ");
 
         // write it in the format that Netscape uses (default)

-        if (! ( m_mailcapStylesInited & wxMAILCAP_BASE  ) )
+        if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD  ) )

         {
             if (! delete_index) file.InsertLine (sTmp, nIndex);
             nIndex ++;
         {
             if (! delete_index) file.InsertLine (sTmp, nIndex);
             nIndex ++;


@@ -1712,7 +1725,7 @@ bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime )
 {
     bool ok = TRUE;
 
 {
     bool ok = TRUE;
 

-    if ( m_mailcapStylesInited & wxMAILCAP_BASE )
+    if ( m_mailcapStylesInited & wxMAILCAP_STANDARD )

     {
         // write in metamail  format;
         if (WriteToMimeTypes (nIndex, delete_mime) )
     {
         // write in metamail  format;
         if (WriteToMimeTypes (nIndex, delete_mime) )


@@ -2193,7 +2206,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
         // the flags and field values on the current line
         bool needsterminal = FALSE,
              copiousoutput = FALSE;
         // 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,
 
         wxString strType,
                  strOpenCmd,


@@ -2518,11 +2531,11 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
         else
         {
             WriteMimeInfo(nIndex, TRUE );
         else
         {
             WriteMimeInfo(nIndex, TRUE );

-            m_aTypes.Remove (nIndex);
-            m_aEntries.Remove (nIndex);
-            m_aExtensions.Remove (nIndex);
-            m_aDescriptions.Remove (nIndex);
-            m_aIcons.Remove (nIndex);
+            m_aTypes.RemoveAt(nIndex);
+            m_aEntries.RemoveAt(nIndex);
+            m_aExtensions.RemoveAt(nIndex);
+            m_aDescriptions.RemoveAt(nIndex);
+            m_aIcons.RemoveAt(nIndex);

         }
     }
     // check data integrity
         }
     }
     // check data integrity