X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20ed1e94d63949b7ea6b8198167affa8921d4682..8e62855a3fecf13954e850d64df98033ef48762b:/include/wx/msw/wx.rc diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 935ba8f525..28da79650a 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -63,6 +63,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 +81,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 @@ -98,6 +98,9 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" // #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 @@ -116,4 +119,5 @@ 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)