remove unused variable assignment, closes #14928

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

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index 935ba8f52546fb89015c9c92c57db308acb39c94..d9aff3b171d177bcd711cc543485db753d751ca7 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -10,11 +10,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__MWERKS__)
-#include <winresrc.h>
-#else

 #include <windows.h>
 #include <windows.h>

-#endif

 
 #if defined(_WIN32_WCE)
     #include "wx/msw/wince/wince.rc"
 
 #if defined(_WIN32_WCE)
     #include "wx/msw/wince/wince.rc"


@@ -63,6 +59,10 @@ WXCURSOR_CROSS          CURSOR  DISCARDABLE     "wx/msw/cross.cur"
 // Default Icons
 //
 
 // 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"
 //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"
 
 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


@@ -98,6 +94,9 @@ 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)

+
+// 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
 #if !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
 
 // see "about isolated applications" topic in MSDN


@@ -116,4 +115,5 @@ wxMANIFEST_ID 24 "wx/msw/wx.manifest"
 #endif
 
 #endif // !defined(WX_MSC_FULL_VER) || WX_MSC_FULL_VER < 140040130
 #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)