X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..edea62818b7808c11e2c536b52941809f338f2fb:/include/wx/msw/wx.rc?ds=sidebyside diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index da439acd9b..619a188d6f 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -30,9 +30,13 @@ ///////////////////////////////////////////////////////////////////////////// #if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__) - #include + #include "wx/msw/gnuwin32/winresrc.h" #else - #include + #include +#endif + +#if defined(_WIN32_WCE) + #include "wx/msw/wince/wince.rc" #endif ////////////////////////////////////////////////////////////////////////////// @@ -63,7 +67,6 @@ 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_SIZING CURSOR DISCARDABLE "wx/msw/size.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" @@ -98,11 +101,20 @@ wxICON_SMALL_REMOVEABLE ICON "wx/msw/removble.ico" // Bitmaps // -wxDISABLE_BUTTON_BITMAP BITMAP "wx/msw/disable.bmp" - // For wxContextHelpButton csquery BITMAP "wx/msw/csquery.bmp" // For obtaining the RGB values of standard colours wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" +////////////////////////////////////////////////////////////////////////////// +// +// Manifest file for Windows XP +// + +#if !defined(__WIN64__) +#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) +1 24 "wx/msw/wx.manifest" +#endif +#endif +