From: Julian Smart Date: Sat, 14 Jun 2003 16:44:18 +0000 (+0000) Subject: Can now skip default manifest inclusion by defining wxUSE_NO_MANIFEST X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b1f68ca3455436222b8704dccdecdb06087c4e7f?ds=inline Can now skip default manifest inclusion by defining wxUSE_NO_MANIFEST git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 354ab7a76a..c1c305a597 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -840,12 +840,6 @@ #define wxUSE_SPLINES 1 // 0 for no splines -#define wxUSE_XPM_IN_MSW 1 - // 0 for no XPM support in wxBitmap. - // Default is 1, as XPM is now fully - // supported this makes easier the issue - // of portable icons and bitmaps. - #define wxUSE_MOUSEWHEEL 1 // Include mouse wheel support diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index fa299cbc13..e9371c812a 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -110,4 +110,7 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp" // Manifest file for Windows XP // +#if !defined(wxUSE_NO_MANIFEST) || (wxUSE_NO_MANIFEST == 0) 1 24 "wx/msw/wx.manifest" +#endif +