X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ed1e94d63949b7ea6b8198167affa8921d4682..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/msw/wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 935ba8f525..702861a287 100644
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -6,15 +6,10 @@
 // Modified by:
 // Created:
 // Copyright:   (c) Julian Smart
-// RCS-ID:      $Id$
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__MWERKS__)
-#include <winresrc.h>
-#else
 #include <windows.h>
-#endif
 
 #if defined(_WIN32_WCE)
     #include "wx/msw/wince/wince.rc"
@@ -54,7 +49,6 @@ 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_BLANK          CURSOR  DISCARDABLE     "wx/msw/blank.cur"
-WXCURSOR_RIGHT_ARROW    CURSOR  DISCARDABLE     "wx/msw/rightarr.cur"
 WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 
 
@@ -63,6 +57,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 +75,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
@@ -94,11 +88,15 @@ 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(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
-#if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+
+#if defined(wxUSE_RC_MANIFEST) && wxUSE_RC_MANIFEST
 
 // see "about isolated applications" topic in MSDN
 #ifdef ISOLATION_AWARE_ENABLED
@@ -113,7 +111,16 @@ wxMANIFEST_ID 24 "wx/msw/amd64.manifest"
 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 // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
+#endif // wxUSE_RC_MANIFEST
+
 #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)