X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99d800190a04a2deaf769017a5fae04a4ae50378..723aa01a832bf97a43f9cb5c0850e82b4998cd7d:/include/wx/msw/wx.rc diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index e46062ac93..d9aff3b171 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -16,6 +16,8 @@ #include "wx/msw/wince/wince.rc" #endif +#include "wx/msw/rcdefs.h" + ////////////////////////////////////////////////////////////////////////////// // // This is the MDI Window menu @@ -43,13 +45,10 @@ WXCURSOR_HAND CURSOR DISCARDABLE "wx/msw/hand.cur" WXCURSOR_BULLSEYE CURSOR DISCARDABLE "wx/msw/bullseye.cur" WXCURSOR_PENCIL CURSOR DISCARDABLE "wx/msw/pencil.cur" WXCURSOR_MAGNIFIER CURSOR DISCARDABLE "wx/msw/magnif1.cur" -WXCURSOR_NO_ENTRY CURSOR DISCARDABLE "wx/msw/noentry.cur" WXCURSOR_ROLLER CURSOR DISCARDABLE "wx/msw/roller.cur" -WXCURSOR_WATCH CURSOR DISCARDABLE "wx/msw/watch1.cur" WXCURSOR_PBRUSH CURSOR DISCARDABLE "wx/msw/pbrush.cur" WXCURSOR_PLEFT CURSOR DISCARDABLE "wx/msw/pntleft.cur" WXCURSOR_PRIGHT CURSOR DISCARDABLE "wx/msw/pntright.cur" -WXCURSOR_QARROW CURSOR DISCARDABLE "wx/msw/query.cur" WXCURSOR_BLANK CURSOR DISCARDABLE "wx/msw/blank.cur" WXCURSOR_RIGHT_ARROW CURSOR DISCARDABLE "wx/msw/rightarr.cur" WXCURSOR_CROSS CURSOR DISCARDABLE "wx/msw/cross.cur" @@ -60,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" @@ -90,9 +93,27 @@ 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) -1 24 "wx/msw/wx.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) +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)