Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-24 23:56:50 +00:00
parent 3f04a3c003
commit 20ed1e94d6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/msw/wx.rc
View File

@@ -100,12 +100,19 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
#if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130 #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) #if defined(WX_CPU_AMD64)
1 24 "wx/msw/amd64.manifest" wxMANIFEST_ID 24 "wx/msw/amd64.manifest"
#elif defined(WX_CPU_IA64) #elif defined(WX_CPU_IA64)
1 24 "wx/msw/ia64.manifest" wxMANIFEST_ID 24 "wx/msw/ia64.manifest"
#elif defined(WX_CPU_X86) #elif defined(WX_CPU_X86)
1 24 "wx/msw/wx.manifest" wxMANIFEST_ID 24 "wx/msw/wx.manifest"
#endif #endif
#endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130 #endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130