X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2867a5bbcc125e55492d6ff4582a9befbf36298..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/wx.rc diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 43ff958d81..c6f941fb7c 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -10,16 +10,14 @@ // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__MWERKS__) -#include -#else #include -#endif #if defined(_WIN32_WCE) #include "wx/msw/wince/wince.rc" #endif +#include "wx/msw/rcdefs.h" + ////////////////////////////////////////////////////////////////////////////// // // This is the MDI Window menu @@ -47,15 +45,11 @@ 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" @@ -64,6 +58,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" @@ -91,12 +89,39 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" ////////////////////////////////////////////////////////////////////////////// // -// Manifest file for Windows XP +// Include manifest file for common controls library v6 required to use themes. +// +// Predefining wxUSE_NO_MANIFEST as 1 always disables the use of the manifest. +// Otherwise we include it only if wxUSE_RC_MANIFEST is defined as 1. // -#if !defined(__WIN64__) #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) -1 24 "wx/msw/wx.manifest" + +#if defined(wxUSE_RC_MANIFEST) && wxUSE_RC_MANIFEST + +// 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" +#else +// Notice that if the manifest is included, WX_CPU_XXX constant corresponding +// to the architecture we're compiling for must be defined. This can be done +// either manually in your make/project file or by configuring the resource +// compiler paths to search in $(WXWIN)/lib/$(COMPILER_PREFIX)_lib/mswu[d] +// directory for its include files, as wx/msw/rcdefs.h file in this directory +// is generated during wxWidgets build and contains the correct definition. +#error "One of WX_CPU_XXX constants must be defined. See comment above." #endif +#endif // wxUSE_RC_MANIFEST + +#endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)