don't generate a scroll event when setting scroll position from scroll event handler

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index e0549a4be1b47f8a136c29c425dd35b12c592560..51d5c5de3f44ba4bc38135586ec5d2b3e8043588 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -20,6 +20,8 @@
     #include "wx/msw/wince/wince.rc"
 #endif
 
+#include "wx/msw/rcdefs.h"
+
 //////////////////////////////////////////////////////////////////////////////
 //
 // This is the MDI Window menu
@@ -91,9 +93,16 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 // Manifest file for Windows XP
 //
 
-#if !defined(__WIN64__)
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
+#if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+
+#if defined(WX_CPU_AMD64)
+1 24 "wx/msw/amd64.manifest"
+#elif defined(WX_CPU_IA64)
+1 24 "wx/msw/ia64.manifest"
+#elif defined(WX_CPU_X86)
 1 24 "wx/msw/wx.manifest"
 #endif
-#endif
 
+#endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)