]> git.saurik.com Git - wxWidgets.git/commitdiff
Don't include Common-Controls manifest in wxBase apps.
authorVáclav Slavík <vslavik@fastmail.fm>
Thu, 28 Feb 2013 13:31:58 +0000 (13:31 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Thu, 28 Feb 2013 13:31:58 +0000 (13:31 +0000)
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

include/wx/defs.h

index fead515ffb154d6013bb6a00760ff72c808b706f..f95bb7cc34fa70d0d0099696c7ebd6da552da5ea 100644 (file)
@@ -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)                     \