From: Václav Slavík <vslavik@fastmail.fm>
Date: Thu, 28 Feb 2013 13:31:58 +0000 (+0000)
Subject: Don't include Common-Controls manifest in wxBase apps.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2026acc1e228e2d0e23244796bce9aa16f7a4599

Don't include Common-Controls manifest in wxBase apps.

If only the non-GUI portions of wxWidgets are used, the dependency on
Microsoft.Windows.Common-Controls assembly shouldn't be automatically
added to Visual C++. Only do it when compiling GUI code.

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index fead515ffb..f95bb7cc34 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -3360,7 +3360,8 @@ typedef const void* WXWidget;
 /*  If a manifest is being automatically generated, add common controls 6 to it */
 /*  --------------------------------------------------------------------------- */
 
-#if (!defined wxUSE_NO_MANIFEST || wxUSE_NO_MANIFEST == 0 ) && \
+#if wxUSE_GUI && \
+    (!defined wxUSE_NO_MANIFEST || wxUSE_NO_MANIFEST == 0 ) && \
     ( defined _MSC_FULL_VER && _MSC_FULL_VER >= 140040130 )
 
 #define WX_CC_MANIFEST(cpu)                     \