X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b6d8c00fcbee0814d2a27f99409731940cf0a51..cb928fe350ca0c093642133cf0de24d1b064aa72:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index 1ef3b17521..d5f4415784 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -40,7 +40,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "mimetype.h" #endif @@ -59,10 +59,6 @@ #ifndef WX_PRECOMP #include "wx/string.h" - #if wxUSE_GUI - #include "wx/icon.h" - - #endif #endif //WX_PRECOMP @@ -1821,7 +1817,7 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, // change nIndex so we can use it below to add the extensions m_aExtensions.Add(wxEmptyString); - nIndex = m_aExtensions.size(); + nIndex = m_aExtensions.size() - 1; m_aDescriptions.Add(strDesc); } @@ -2177,7 +2173,7 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) else if ( strLHS == wxT("exts") ) { strExtensions = strRHS; } - else if ( strLHS != _T("icon") ) + else if ( strLHS == _T("icon") ) { // this one is simply ignored: it usually refers to Netscape // built in icons which are useless for us anyhow