X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5db932052d21902841cc626d065f5d7475cf8997..16ca2e0fac252c2e900718122e058e7dad58c991:/include/wx/msw/wx.rc diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index fa299cbc13..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 ////////////////////////////////////////////////////////////////////////////// @@ -97,8 +101,6 @@ 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" @@ -110,4 +112,9 @@ 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 +