From a862159daa17d0860dfdf8d8033a8845ad7bce1f Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 4 Jun 2007 09:01:37 +0000 Subject: [PATCH] added comment explaining the condition for compiling manifest into resources git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/wx.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 2e720ea222..28da79650a 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -98,6 +98,9 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" // #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) + +// Visual Studio 2005 generates the manifest automatically and so we +// shouldn't include it in the resources manually: #if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130 // see "about isolated applications" topic in MSDN @@ -116,4 +119,5 @@ wxMANIFEST_ID 24 "wx/msw/wx.manifest" #endif #endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130 + #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) -- 2.45.2