From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 13 Jul 2013 23:23:27 +0000 (+0000)
Subject: Restore embedding manifest when using MinGW.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4de55d6f31cac23956f3993cee0b1980de4a7531

Restore embedding manifest when using MinGW.

The changes of r73483 broke inclusion of the manifest in the programs built
using MinGW because wxUSE_RC_MANIFEST was never defined. Somehow nobody
complained about it but this resulted in using comctl32.dll 5.80 instead of
6.0 and e.g. problems with toolbar appearance (see #13512).

Do use the manifest by default with MinGW and, in fact, all the other
compilers if any other ones still work, as only MSVC is known to embed the
manifest automatically and we take care of it separately.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/msw/genrcdefs.h b/include/wx/msw/genrcdefs.h
index a69638e9ba..24f4f1f621 100644
--- a/include/wx/msw/genrcdefs.h
+++ b/include/wx/msw/genrcdefs.h
@@ -16,6 +16,8 @@ EMIT(#define _WX_RCDEFS_H)
 #if _MSC_FULL_VER < 140040130
 EMIT(#define wxUSE_RC_MANIFEST 1)
 #endif
+#else
+EMIT(#define wxUSE_RC_MANIFEST 1)
 #endif
 
 #ifdef _M_AMD64