X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6429ac6d63c399109adb80ef832827c94d04ce5e..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/msw/wx.rc?ds=inline diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 3931d5cf06..28da79650a 100644 --- 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 @@ -61,6 +63,10 @@ WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.cur" // Default Icons // +// First wx icon in alphabetical order, so it will be used by Explorer if the +// application doesn't have any icons of its own +wxICON_AAA ICON "wx/msw/std.ico" + //wxDEFAULT_FRAME ICON "wx/msw/std.ico" //wxDEFAULT_MDIPARENTFRAME ICON "wx/msw/mdi.ico" //wxDEFAULT_MDICHILDFRAME ICON "wx/msw/child.ico" @@ -93,12 +99,25 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) -#ifdef WX_CPU_AMD64 -1 24 "wx/msw/amd64.manifest" +// 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 +#ifdef ISOLATION_AWARE_ENABLED +#define wxMANIFEST_ID 2 +#else +#define wxMANIFEST_ID 1 +#endif + +#if defined(WX_CPU_AMD64) +wxMANIFEST_ID 24 "wx/msw/amd64.manifest" #elif defined(WX_CPU_IA64) -1 24 "wx/msw/ia64.manifest" -#elif !defined(__WIN64__) -1 24 "wx/msw/wx.manifest" +wxMANIFEST_ID 24 "wx/msw/ia64.manifest" +#elif defined(WX_CPU_X86) +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)