From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 24 Oct 2006 23:56:50 +0000 (+0000)
Subject: use manifest id of 2 if ISOLATION_AWARE_ENABLED is defined (bug/feature request 1222189)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/20ed1e94d63949b7ea6b8198167affa8921d4682?ds=inline

use manifest id of 2 if ISOLATION_AWARE_ENABLED is defined (bug/feature request 1222189)


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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 5ad8e67df0..935ba8f525 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -100,12 +100,19 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 #if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
 
+// see "about isolated applications" topic in MSDN
+#ifdef ISOLATION_AWARE_ENABLED
+#define wxMANIFEST_ID 2
+#else
+#define wxMANIFEST_ID 1
+#endif
+
 #if defined(WX_CPU_AMD64)
-1 24 "wx/msw/amd64.manifest"
+wxMANIFEST_ID 24 "wx/msw/amd64.manifest"
 #elif defined(WX_CPU_IA64)
-1 24 "wx/msw/ia64.manifest"
+wxMANIFEST_ID 24 "wx/msw/ia64.manifest"
 #elif defined(WX_CPU_X86)
-1 24 "wx/msw/wx.manifest"
+wxMANIFEST_ID 24 "wx/msw/wx.manifest"
 #endif
 
 #endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130