Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining occurrences of wxUSE_XPM_IN_MSW.

Browse Source 
This symbol is not used since a very long time as XPM support is now always
available in wxMSW and most of its occurrences were removed almost 10 years
ago, just remove the remaining ones too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-03-31 01:11:50 +00:00
parent 8dd4c6113d
commit 4e2756feef
4 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/doxygen/mainpages/const_wxusedef.h
View File

@@ -364,7 +364,6 @@ compilers. See also wxUSE_NO_MANIFEST.}
@itemdef{wxUSE_UXTHEME, Enable support for XP themes.} @itemdef{wxUSE_UXTHEME, Enable support for XP themes.}
@itemdef{wxUSE_WIN_METAFILES_ALWAYS, Use wxMetaFile even when wxUSE_ENH_METAFILE=1.} @itemdef{wxUSE_WIN_METAFILES_ALWAYS, Use wxMetaFile even when wxUSE_ENH_METAFILE=1.}
@itemdef{wxUSE_WXDIB, Use wxDIB class.} @itemdef{wxUSE_WXDIB, Use wxDIB class.}
@itemdef{wxUSE_XPM_IN_MSW, See also wxUSE_XPM}
@endDefList @endDefList

4
samples/toolbar/toolbar.cpp
View File

@@ -43,10 +43,6 @@
#define USE_XPM_BITMAPS 1 #define USE_XPM_BITMAPS 1
#endif #endif
#if USE_XPM_BITMAPS && defined(__WXMSW__) && !wxUSE_XPM_IN_MSW
#error You need to enable XPM support to use XPM bitmaps with toolbar!
#endif // USE_XPM_BITMAPS
// If this is 1, the sample will test an extra toolbar identical to the // If this is 1, the sample will test an extra toolbar identical to the
// main one, but not managed by the frame. This can test subtle differences // main one, but not managed by the frame. This can test subtle differences
// in the way toolbars are handled, especially on Mac where there is one // in the way toolbars are handled, especially on Mac where there is one

4
setup.h.in
View File

@@ -1258,10 +1258,6 @@
#ifdef __WIN32__ #ifdef __WIN32__
/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
with wx/msw/setup.h */
#define wxUSE_XPM_IN_MSW wxUSE_XPM
/* When using an external jpeg library and the Windows headers already define /* When using an external jpeg library and the Windows headers already define
* boolean, define to the type used by the jpeg library for boolean. */ * boolean, define to the type used by the jpeg library for boolean. */
#undef wxHACK_BOOLEAN #undef wxHACK_BOOLEAN

4
setup.h_vms
View File

@@ -1384,10 +1384,6 @@ typedef pid_t GPid;
#ifdef __WIN32__ #ifdef __WIN32__
/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibil
with wx/msw/setup.h */
#define wxUSE_XPM_IN_MSW wxUSE_XPM
#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
/* Define if the header pbt.h is missing. */ /* Define if the header pbt.h is missing. */