X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b813b73cd79cfb4d275e9628811f379e8c5ee39..65a9e6162bfc9b98b4249b218402f7caceee56f7:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index 62487d68ea..5f86b8f068 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -79,6 +79,11 @@ // other standard headers #include +#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,8 +299,8 @@ static bool IsKnownUnimportantField(const wxString& field); // a) for "brief" format: // // b) for "expanded" format: -// type= \ -// desc="" \ +// type= \ +// desc="" \ // exts="" // // 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 - if ( (mailcapStyles & wxMAILCAP_NETSCAPE) || (mailcapStyles & wxMAILCAP_BASE) ) + if ( (mailcapStyles & wxMAILCAP_NETSCAPE) || + (mailcapStyles & wxMAILCAP_STANDARD) ) 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 - if (! ( m_mailcapStylesInited & wxMAILCAP_BASE) ) + if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) 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) || - ( m_mailcapStylesInited & wxMAILCAP_BASE) ) ) + ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) ) 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) - if (! ( m_mailcapStylesInited & wxMAILCAP_BASE ) ) + if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) ) { if (! delete_index) file.InsertLine (sTmp, nIndex); nIndex ++; @@ -1712,7 +1718,7 @@ bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime ) { bool ok = TRUE; - if ( m_mailcapStylesInited & wxMAILCAP_BASE ) + if ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) { // write in metamail format; if (WriteToMimeTypes (nIndex, delete_mime) )