change wxDataViewItem id to void*

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 2e720ea222bf7337afe1f81ce943e9a1b11339eb..28da79650a46ca8aee7536cb70fec9198e12738f 100644 (file)
--- 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)
 //
 
 #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
 #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
 
 #endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130

+

 #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)