X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2273efca477573381f9d64b856df64ddba3279f2..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/include/wx/msw/wx.rc diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 5ad8e67df0..d9aff3b171 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -10,11 +10,7 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__MWERKS__) -#include -#else #include -#endif #if defined(_WIN32_WCE) #include "wx/msw/wince/wince.rc" @@ -63,6 +59,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" @@ -77,10 +77,6 @@ wxICON_SMALL_CDROM ICON "wx/msw/cdrom.ico" wxICON_SMALL_FLOPPY ICON "wx/msw/floppy.ico" wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico" -// Low alphabetically to make it the default, but not so low as to -// affect applications that use 'a' -bICON ICON "wx/msw/std.ico" - ////////////////////////////////////////////////////////////////////////////// // // Bitmaps @@ -98,15 +94,26 @@ 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 +#ifdef ISOLATION_AWARE_ENABLED +#define wxMANIFEST_ID 2 +#else +#define wxMANIFEST_ID 1 +#endif + #if defined(WX_CPU_AMD64) -1 24 "wx/msw/amd64.manifest" +wxMANIFEST_ID 24 "wx/msw/amd64.manifest" #elif defined(WX_CPU_IA64) -1 24 "wx/msw/ia64.manifest" +wxMANIFEST_ID 24 "wx/msw/ia64.manifest" #elif defined(WX_CPU_X86) -1 24 "wx/msw/wx.manifest" +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)