From 7ec3a14c9a76eb4fe82af164c764b23502abd523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C4=83t=C4=83lin=20R=C4=83ceanu?= Date: Fri, 3 Aug 2018 00:43:50 +0300 Subject: [PATCH] do not allow HAS_LOAD_FROM_RESOURCE for wxQT, at least for now --- src/common/image.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/image.cpp b/src/common/image.cpp index 846eeee64f..fd03e042a6 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -2481,7 +2481,8 @@ int wxImage::GetLoadFlags() const // Under Windows we can load wxImage not only from files but also from // 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 #endif