fixed priority of the mailcap entries (patch 935954)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -133,6 +133,9 @@ wxHTML:
|
||||
- improved tables and lists layout algorithms (Tim Kosse)
|
||||
- <div> handling fix (Xavier Nodet)
|
||||
|
||||
Unix:
|
||||
- fixed priorities of mailcap entries (David Hart)
|
||||
|
||||
|
||||
2.5.1
|
||||
-----
|
||||
|
@@ -2707,9 +2707,10 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
|
||||
// have we seen this one before?
|
||||
int nIndex = m_aTypes.Index(data.type);
|
||||
|
||||
// and if we have, was it in this file?
|
||||
// and if we have, was it in this file? if not, we should
|
||||
// overwrite the previously seen one
|
||||
overwrite = nIndex == wxNOT_FOUND ||
|
||||
aIndicesSeenHere.Index(nIndex) != wxNOT_FOUND;
|
||||
aIndicesSeenHere.Index(nIndex) == wxNOT_FOUND;
|
||||
}
|
||||
|
||||
wxLogTrace(TRACE_MIME, _T("mailcap %s: %s [%s]"),
|
||||
|
Reference in New Issue
Block a user