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

do not allow HAS_LOAD_FROM_RESOURCE for wxQT, at least for now

Browse Source
This commit is contained in:
Cătălin Răceanu
2018-08-03 00:43:50 +03:00
parent ee8ab1b9aa
commit 7ec3a14c9a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/image.cpp
View File

@@ -2481,7 +2481,8 @@ int wxImage::GetLoadFlags() const
// Under Windows we can load wxImage not only from files but also from // Under Windows we can load wxImage not only from files but also from
// resources. // resources.
#if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE #if defined(__WINDOWS__) && wxUSE_WXDIB && wxUSE_IMAGE \
&& !defined(__WXQT__) // undefined reference to `wxDIB::ConvertToImage(wxDIB::ConversionFlags) const'
#define HAS_LOAD_FROM_RESOURCE #define HAS_LOAD_FROM_RESOURCE
#endif #endif