added lowercase functionality to wxHexToDec

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

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index 62487d68ea4bf2a9302f1858d4cb96e8c94d87c0..5f86b8f068ddcbae87e5fc6e474bbe08f2b1d4b1 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,8 +299,8 @@ 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> \ 
+//      desc="<description>" \ 

 //      exts="<comma separated list of extensions>"
 //
 // We try to autodetect the format of mime.types: if a non-comment line starts
 //      exts="<comma separated list of extensions>"
 //
 // We try to autodetect the format of mime.types: if a non-comment line starts


@@ -1291,7 +1296,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 +1381,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 +1523,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 +1574,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 +1718,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) )