added wxDelegateTheme to accompany wxDelegateRenderer

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index c66cda217a25c8bee9c0bbf1b5357238021b2a08..935ba8f52546fb89015c9c92c57db308acb39c94 100644 (file)
--- 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/wince/wince.rc"
 #endif
 

+#include "wx/msw/rcdefs.h"
+

 //////////////////////////////////////////////////////////////////////////////
 //
 // This is the MDI Window menu
 //////////////////////////////////////////////////////////////////////////////
 //
 // This is the MDI Window menu


@@ -75,6 +77,10 @@ wxICON_SMALL_CDROM              ICON "wx/msw/cdrom.ico"
 wxICON_SMALL_FLOPPY             ICON "wx/msw/floppy.ico"
 wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.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
 //////////////////////////////////////////////////////////////////////////////
 //
 // Bitmaps


@@ -92,13 +98,22 @@ wxBITMAP_STD_COLOURS    BITMAP "wx/msw/colours.bmp"
 //
 
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 //
 
 #if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)

+#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 WX_CPU_AMD64
-1 24 "wx/msw/amd64.manifest"
-#elif WX_CPU_IA64
-1 24 "wx/msw/ia64.manifest"
-#elif !defined(__WIN64__)
-1 24 "wx/msw/wx.manifest"
+#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
 

+#endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130

 #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)
 #endif // !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0)