Remove remaining occurrences of wxUSE_XPM_IN_MSW.

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

diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h
index e4cf76046939cdda73d1411fa60b31452fc9a90c..800816988247ec55fd6b0dbe3394988cb2a45fe6 100644 (file)
--- a/docs/doxygen/mainpages/const_wxusedef.h
+++ b/docs/doxygen/mainpages/const_wxusedef.h
@@ -364,7 +364,6 @@ compilers. See also wxUSE_NO_MANIFEST.}
 @itemdef{wxUSE_UXTHEME, Enable support for XP themes.}
 @itemdef{wxUSE_WIN_METAFILES_ALWAYS, Use wxMetaFile even when wxUSE_ENH_METAFILE=1.}
 @itemdef{wxUSE_WXDIB, Use wxDIB class.}
-@itemdef{wxUSE_XPM_IN_MSW, See also wxUSE_XPM}
 @endDefList
 
 

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 8f8da745bc73870a8019f2c9a0374bb3223d7cf9..f996ac59f0bf9db5459d523ec61f1d260e4dd483 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -43,10 +43,6 @@
     #define USE_XPM_BITMAPS 1
 #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
 // 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

diff --git a/setup.h.in b/setup.h.in
index 9f3391f000f463640fd8ed96f45f3b640c7def52..75588db31162e2481601842e9fe3b1e27db2f239 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1258,10 +1258,6 @@
 
 #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
  * boolean, define to the type used by the jpeg library for boolean.  */
 #undef wxHACK_BOOLEAN

diff --git a/setup.h_vms b/setup.h_vms
index 91827f14babcd1740efd0c93685b5fe58bcff092..dbf8f2dd74f41a543f2c3f43b6b5f707d99324cc 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -1384,10 +1384,6 @@ typedef pid_t GPid;
 
 #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 if the header pbt.h is missing.  */