Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxMSW compilation with old MinGW versions without ASSOCXXX constants.

Browse Source 
Define ASSOCF_NOTRUNCATE and ASSOCSTR_DEFAULTICON ourselves to let the code
compile with older MinGW.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-07-02 13:28:33 +00:00
parent e1655f5394
commit 8ebe2c4066
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/mimetype.cpp
View File

@@ -42,6 +42,13 @@
#include <shlwapi.h> #include <shlwapi.h>
#endif // OS #endif // OS
// Unfortunately the corresponding SDK constants are absent from the headers
// shipped with some old MinGW versions (e.g. 4.2.1 from Debian) and we can't
// even test whether they're defined or not, as they're enum elements and not
// preprocessor constants. So we have to always use our own constants.
#define wxASSOCF_NOTRUNCATE (static_cast<ASSOCF>(0x20))
#define wxASSOCSTR_DEFAULTICON (static_cast<ASSOCSTR>(15))
// other standard headers // other standard headers
#include <ctype.h> #include <ctype.h>
@@ -246,7 +253,7 @@ wxString wxAssocQueryString(ASSOCSTR assoc,
HRESULT hr = s_pfnAssocQueryString HRESULT hr = s_pfnAssocQueryString
( (
ASSOCF_NOTRUNCATE, // Fail if buffer is too small. wxASSOCF_NOTRUNCATE,// Fail if buffer is too small.
assoc, // The association to retrieve. assoc, // The association to retrieve.
ext.t_str(), // The extension to retrieve it for. ext.t_str(), // The extension to retrieve it for.
verb.empty() ? NULL verb.empty() ? NULL
@@ -385,7 +392,7 @@ bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
{ {
wxString strIcon = wxAssocQueryString(ASSOCSTR_DEFAULTICON, m_ext); wxString strIcon = wxAssocQueryString(wxASSOCSTR_DEFAULTICON, m_ext);
if ( !strIcon.empty() ) if ( !strIcon.empty() )
{ {