Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.

Add a special symbol which is defined only if the icons and other images (e.g. cursor) are in the separate resource files and don't need to be embedded as XPMs in the main program. This makes the checks more clear and more customizable as it's enough to change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform checks. Closes #14050. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00 · 2012-03-04 00:28:58 +00:00 · e709239889
commit e709239889
parent b303fca714
84 changed files with 92 additions and 87 deletions
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@ -29,8 +29,7 @@
 #   include <time.h>
 #endif

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
-    || defined(__WXMAC__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
 #   include "bombs.xpm"
 #endif

--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@ -38,7 +38,7 @@
 // resources
 // --------------------------------------------------------------------------

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    // application icon
    #include "mondrian.xpm"

--- a/docs/doxygen/mainpages/const_cpp.h
+++ b/docs/doxygen/mainpages/const_cpp.h
@ -214,6 +214,8 @@ Currently the following symbols exist:
    decide whether some function should be overloaded for both
    <code>long</code> and <code>long long</code> types.}
@itemdef{wxHAS_MULTIPLE_FILEDLG_FILTERS, Defined if wxFileDialog supports multiple ('|'-separated) filters.}
+@itemdef{wxHAS_IMAGES_IN_RESOURCES, Defined if <a href="http://en.wikipedia.org/wiki/Resource_(Windows)">
+    Windows resource files</a> or OS/2 resource files are available on the current platform.}
@itemdef{wxHAS_POWER_EVENTS, Defined if wxPowerEvent are ever generated on the current platform.}
@itemdef{wxHAS_RADIO_MENU_ITEMS,
        Defined if the current port supports radio menu items (see wxMenu::AppendRadioItem).}
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@ -160,14 +160,18 @@ enum wxStockCursor
 // macros
 // ---------------------------------------------------------------------------

+#if defined(__WINDOWS__) || defined(__WXPM__)
+    #define wxHAS_IMAGES_IN_RESOURCES
+#endif
+
 /* Useful macro for creating icons portably, for example:

    wxIcon *icon = new wxICON(sample);

  expands into:

-    wxIcon *icon = new wxIcon("sample");      // On wxMSW
-    wxIcon *icon = new wxIcon(sample_xpm);    // On wxGTK
+    wxIcon *icon = new wxIcon("sample");      // On Windows
+    wxIcon *icon = new wxIcon(sample_xpm);    // On wxGTK/Linux
 */

 #ifdef __WXMSW__
--- a/samples/access/accesstest.cpp
+++ b/samples/access/accesstest.cpp
@ -59,7 +59,7 @@
 // ----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@ -28,7 +28,7 @@
    #include "wx/wx.h"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/artprov/arttest.cpp
+++ b/samples/artprov/arttest.cpp
@ -20,7 +20,7 @@
 #include "wx/wx.h"
 #endif

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@ -31,7 +31,7 @@
 // ----------------------------------------------------------------------------

 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/clipboard/clipboard.cpp
+++ b/samples/clipboard/clipboard.cpp
@ -22,7 +22,7 @@

 #include "wx/clipbrd.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/collpane/collpane.cpp
+++ b/samples/collpane/collpane.cpp
@ -44,7 +44,7 @@
 #include "wx/fontpicker.h"
 #include "wx/aboutdlg.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/combo/combo.cpp
+++ b/samples/combo/combo.cpp
@ -45,7 +45,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@ -29,7 +29,7 @@
 #include "wx/log.h"
 #include "wx/config.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@ -58,7 +58,7 @@
    #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@ -41,7 +41,7 @@
 // resources
 // ----------------------------------------------------------------------------

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/debugrpt/debugrpt.cpp
+++ b/samples/debugrpt/debugrpt.cpp
@ -35,7 +35,7 @@
    #error "This sample can't be built without wxUSE_ON_FATAL_EXCEPTION"
 #endif // wxUSE_ON_FATAL_EXCEPTION

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@ -36,7 +36,7 @@

 #include "wx/dialup.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@ -36,7 +36,7 @@


 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@ -27,7 +27,7 @@
 #include "wx/metafile.h"
 #include "wx/dirctrl.h"

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #if wxUSE_DRAG_AND_DROP
    #include "dnd_copy.xpm"
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@ -61,7 +61,7 @@
    #include "wx/filename.h"
 #endif

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "doc.xpm"
    #include "chart.xpm"
    #include "notepad.xpm"
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@ -36,7 +36,7 @@

 #include "dragimag.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
    #include "dragicon.xpm"
 #endif
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@ -46,7 +46,7 @@
 // ----------------------------------------------------------------------------

 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@ -39,7 +39,7 @@
 // ----------------------------------------------------------------------------

 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@ -30,7 +30,7 @@
    #include "wx/wx.h"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@ -53,7 +53,7 @@
 // ----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/flash/flash.cpp
+++ b/samples/flash/flash.cpp
@ -39,7 +39,7 @@
 #include "wx/cmdline.h"
 #include "wx/filename.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@ -17,7 +17,7 @@
    #include "wx/wx.h"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@ -39,7 +39,7 @@

 #include "griddemo.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@ -79,7 +79,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@ -27,7 +27,7 @@
 #include "wx/wxhtml.h"
 #include "wx/statline.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@ -28,7 +28,7 @@
 #include "wx/filesys.h"
 #include "wx/fs_zip.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@ -32,7 +32,7 @@

 #include "wx/html/webkit.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@ -25,7 +25,7 @@
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@ -24,7 +24,7 @@

 #include "wx/html/htmlwin.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@ -26,7 +26,7 @@
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@ -50,7 +50,7 @@

 #include "canvas.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@ -37,7 +37,7 @@
 #include "wx/log.h"
 #include "wx/cmdline.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@ -35,7 +35,7 @@
 #include "wx/datetime.h"
 #include "client.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/ipc/server.cpp
+++ b/samples/ipc/server.cpp
@ -32,7 +32,7 @@
 // we're using TCP/IP or real DDE.
 #include "ipcsetup.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@ -31,7 +31,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@ -18,7 +18,7 @@
    #include "wx/wx.h"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@ -35,7 +35,7 @@

 #include "layout.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@ -20,11 +20,11 @@
 #include "wx/wx.h"
 #endif

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "bitmaps/toolbrai.xpm"
    #include "bitmaps/toolchar.xpm"
    #include "bitmaps/tooldata.xpm"
@ -177,7 +177,7 @@ MyFrame::MyFrame(const wxChar *title)
    m_imageListNormal = new wxImageList(32, 32, true);
    m_imageListSmall = new wxImageList(16, 16, true);

-#ifdef __WXMSW__
+#if wxHAS_IMAGES_IN_RESOURCES
    m_imageListNormal->Add( wxIcon(wxT("icon1"), wxBITMAP_TYPE_ICO_RESOURCE) );
    m_imageListNormal->Add( wxIcon(wxT("icon2"), wxBITMAP_TYPE_ICO_RESOURCE) );
    m_imageListNormal->Add( wxIcon(wxT("icon3"), wxBITMAP_TYPE_ICO_RESOURCE) );
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@ -32,7 +32,7 @@

 #include "wx/toolbar.h"

-#if !defined(__WXMSW__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
    #include "chart.xpm"
 #endif
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@ -78,7 +78,7 @@
    wxFORCE_LINK_MODULE(wxmediabackend_wmp10)
 #endif // static wxMSW build

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@ -22,7 +22,7 @@

 #include "wx/datetime.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@ -59,7 +59,7 @@
 #include "copy.xpm"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@ -36,7 +36,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@ -24,7 +24,7 @@
 #error Sorry, this sample is only appropriate under Windows.
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@ -26,7 +26,7 @@
 #include "wx/utils.h"
 #include "notebook.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@ -40,7 +40,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@ -34,7 +34,7 @@

 #include "cube.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../../sample.xpm"
 #endif

--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@ -39,7 +39,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/power/power.cpp
+++ b/samples/power/power.cpp
@ -33,7 +33,7 @@

 #include "wx/power.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@ -51,7 +51,7 @@

 #include "printing.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@ -68,7 +68,7 @@

 #include <wx/artprov.h>

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/render/render.cpp
+++ b/samples/render/render.cpp
@ -47,7 +47,7 @@
 // ----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@ -46,7 +46,7 @@
 #include "wx/cshelp.h"
 #endif

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@ -22,7 +22,7 @@
 #include "wx/log.h"
 #include "wx/tglbtn.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@ -41,7 +41,7 @@
 #include "wx/graphics.h"
 #include "wx/image.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@ -39,7 +39,7 @@
 // --------------------------------------------------------------------------

 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@ -45,7 +45,7 @@
 // --------------------------------------------------------------------------

 // the application icon
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@ -36,7 +36,7 @@
 // ----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/splash/splash.cpp
+++ b/samples/splash/splash.cpp
@ -40,7 +40,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@ -39,7 +39,7 @@
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@ -50,7 +50,7 @@
 #include "wx/numdlg.h"
 #include "wx/fontdlg.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@ -44,7 +44,7 @@
 //----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@ -36,7 +36,7 @@
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/taborder/taborder.cpp
+++ b/samples/taborder/taborder.cpp
@ -39,7 +39,7 @@

 #include "wx/notebook.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@ -29,7 +29,7 @@
 #endif

 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@ -45,7 +45,7 @@
 #include "wx/numdlg.h"
 #include "wx/tokenzr.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@ -60,7 +60,7 @@
 // resources
 // ----------------------------------------------------------------------------

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@ -53,7 +53,7 @@
 #include "unchecked.xpm"
 #include "checked.xpm"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/treelist/treelist.cpp
+++ b/samples/treelist/treelist.cpp
@ -45,7 +45,7 @@
 // Resources
 // ----------------------------------------------------------------------------

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@ -25,7 +25,7 @@

 #include "typetest.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/uiaction/uiaction.cpp
+++ b/samples/uiaction/uiaction.cpp
@ -40,7 +40,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@ -33,7 +33,7 @@
 #include "wx/valtext.h"
 #include "wx/valnum.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/vscroll/vstest.cpp
+++ b/samples/vscroll/vstest.cpp
@ -40,7 +40,7 @@
 // ----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@ -35,7 +35,7 @@
 #include "wx/filesys.h"
 #include "wx/fs_arc.h"

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/wrapsizer/wrapsizer.cpp
+++ b/samples/wrapsizer/wrapsizer.cpp
@ -21,7 +21,7 @@
 #include "wx/wrapsizer.h"
 #include "wx/artprov.h"

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@ -61,7 +61,7 @@

 // the application icon (under Windows and OS/2 it is in resources and even
 // though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/samples/xti/xti.cpp
+++ b/samples/xti/xti.cpp
@ -58,7 +58,7 @@
 // resources
 // ----------------------------------------------------------------------------

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "../sample.xpm"
 #endif

--- a/utils/emulator/src/emulator.cpp
+++ b/utils/emulator/src/emulator.cpp
@ -48,7 +48,7 @@
 // ----------------------------------------------------------------------------

 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
    #include "emulator.xpm"
 #endif

--- a/utils/helpview/src/client.cpp
+++ b/utils/helpview/src/client.cpp
@ -45,7 +45,7 @@
 //#define wxUSE_DDE_FOR_IPC 0
 #include <wx/ipc.h>

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
 #include "mondrian.xpm"
 #endif

--- a/utils/helpview/src/remhelp.cpp
+++ b/utils/helpview/src/remhelp.cpp
@ -31,7 +31,7 @@
 //#include "ddesetup.h"
 //#define wxUSE_DDE_FOR_IPC 0

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
 #include "mondrian.xpm"
 #endif