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

diff --git a/demos/bombs/bombs.cpp b/demos/bombs/bombs.cpp
index 387941b0e4f6c901c3d6466ba8b1d92e406dcccf..2c756fcff3fb8847a1e4eaf66ada5350bab634d8 100644 (file)
--- a/demos/bombs/bombs.cpp
+++ b/demos/bombs/bombs.cpp
@@ -29,8 +29,7 @@
 #   include <time.h>
 #endif
 
 #   include <time.h>
 #endif
 

-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) \
-    || defined(__WXMAC__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

 #   include "bombs.xpm"
 #endif
 
 #   include "bombs.xpm"
 #endif
 

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 3a256a67f24a78ecefae34e1af1c302da093fad6..39d74b2d2f0056c131c1dd7e46103b00cf3ab59b 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -38,7 +38,7 @@
 // resources
 // --------------------------------------------------------------------------
 
 // resources
 // --------------------------------------------------------------------------
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     // application icon
     #include "mondrian.xpm"
 
     // application icon
     #include "mondrian.xpm"
 

diff --git a/docs/doxygen/mainpages/const_cpp.h b/docs/doxygen/mainpages/const_cpp.h
index 9c71d03efa7f4598dabc967ece8f3a87dab9ca59..ad7a04d0e62c39e0371d2b5521cde2e2121b3f9e 100644 (file)
--- 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.}
     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).}
 @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).}

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index cf9473743764d0a50732c7c9f92bb9c5291690d6..3ef7d6c98cfd286c62b0a2a0d548f567fd08beeb 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -160,14 +160,18 @@ enum wxStockCursor
 // macros
 // ---------------------------------------------------------------------------
 
 // 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:
 
 /* 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__
  */
 
 #ifdef __WXMSW__

diff --git a/samples/access/accesstest.cpp b/samples/access/accesstest.cpp
index cd47c0cc7ff4bb3c8ef9d1616e308164f34a535b..29e92dad79dd83d993edf55dc3c19f7ee9f4892d 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index e2500c0fc55aed7376021d691b0fe3e6f9ed0d2f..e958d585a215b616abcb6cd57e110bd28523eb0e 100644 (file)
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -28,7 +28,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/artprov/arttest.cpp b/samples/artprov/arttest.cpp
index ff541274c630718a196e5b99f033a9cf51690a52..36f9553275de9adeced57a696259820fab6fedfc 100644 (file)
--- a/samples/artprov/arttest.cpp
+++ b/samples/artprov/arttest.cpp
@@ -20,7 +20,7 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index c1dc4d870a177f09893dc61ef34f78d45f4f2513..a9c44ca2f9bfa47b46df65d7eefd13f9335e836d 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -31,7 +31,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon
 // ----------------------------------------------------------------------------
 
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp
index ff139cfa23ce662a6386e40ecfcbf8eda8df23c1..1dc3a4216c3584c2adb43bad6c8fbeba2244cf69 100644 (file)
--- a/samples/clipboard/clipboard.cpp
+++ b/samples/clipboard/clipboard.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/clipbrd.h"
 
 
 #include "wx/clipbrd.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/collpane/collpane.cpp b/samples/collpane/collpane.cpp
index b7574d8e4c528160d6e8e1bc38bc2c273ff464c0..27cccb9f7714f0a4f21def127259eb886e9cbdc8 100644 (file)
--- a/samples/collpane/collpane.cpp
+++ b/samples/collpane/collpane.cpp
@@ -44,7 +44,7 @@
 #include "wx/fontpicker.h"
 #include "wx/aboutdlg.h"
 
 #include "wx/fontpicker.h"
 #include "wx/aboutdlg.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/combo/combo.cpp b/samples/combo/combo.cpp
index 2ed5167ad50667b194ec8e30aa207a5db6e846f5..7710587b7379612cb7d625f26a3b9a33d47b3ba7 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index a9c56761ab92e3328b2a710ffbbb609af6ce3a93..dd903e237854066b97bad0b9b6eeda8f5619c5c4 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -29,7 +29,7 @@
 #include "wx/log.h"
 #include "wx/config.h"
 
 #include "wx/log.h"
 #include "wx/config.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index d1e553ba85356ceba7a7469e75e2cd5675177b96..f158e9e1e7506fb606871a1577fb223a30bf6e75 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -58,7 +58,7 @@
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 
     #define EVT_TOGGLEBUTTON EVT_CHECKBOX
 #endif
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index 194fd587ad5789a2062e63b55fea01a2793e8774..2feca42856f1944d9aeb698c15ccf6f0e6fae282 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -41,7 +41,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/debugrpt/debugrpt.cpp b/samples/debugrpt/debugrpt.cpp
index 3107665b9194ca77b3a491da21301671804076b1..7a1f9c83a35ad5cdf4cda737a220b647281cfbbd 100644 (file)
--- 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
 
     #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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 9906cdb59a50ed8eeef1ecfb1ec6b1cd4ec9d1c4..5f7e025b7597b3281b98c41fa21f88ffe9df00af 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -36,7 +36,7 @@
 
 #include "wx/dialup.h"
 
 
 #include "wx/dialup.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 7f686a2e43c92f868c382c1f06c11f1ef53e42ea..8477103b8b1c5cda4434ade27aabbc5dac6b555d 100644 (file)
--- 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)
 
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 7916600905d9c13fcb6f080b9f10e733462946d1..62b65b9d9e4fd029878207e80d7d68f6ea7bd392 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -27,7 +27,7 @@
 #include "wx/metafile.h"
 #include "wx/dirctrl.h"
 
 #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"
     #include "../sample.xpm"
 #if wxUSE_DRAG_AND_DROP
     #include "dnd_copy.xpm"

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index 287f7876dc4ea48306b6740a768b610be2d78bea..6c11e54648932fcd6eba6e555d24ca185b72837f 100644 (file)
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -61,7 +61,7 @@
     #include "wx/filename.h"
 #endif
 
     #include "wx/filename.h"
 #endif
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "doc.xpm"
     #include "chart.xpm"
     #include "notepad.xpm"
     #include "doc.xpm"
     #include "chart.xpm"
     #include "notepad.xpm"

diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp
index ddebcc591617c5153fcedaefc1883028f2d0fe3a..3247e32e2d401f8096c2a728d9d98d9fd38c886e 100644 (file)
--- a/samples/dragimag/dragimag.cpp
+++ b/samples/dragimag/dragimag.cpp
@@ -36,7 +36,7 @@
 
 #include "dragimag.h"
 
 
 #include "dragimag.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
     #include "dragicon.xpm"
 #endif
     #include "../sample.xpm"
     #include "dragicon.xpm"
 #endif

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index ac208afd8dc7e413fb54f043a8f9495afed9f3b8..2fe0bf4b66b3a80b91e7e31f5eaac911986f41cd 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -46,7 +46,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon
 // ----------------------------------------------------------------------------
 
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index ee468651b6d5d68dec223d3cb67e48e088e3b879..eb54c2ede3e43c215d7df50bbf84e7e132dbdb23 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -39,7 +39,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon
 // ----------------------------------------------------------------------------
 
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/event/event.cpp b/samples/event/event.cpp
index b71f094e91352c23f851fcb4b4d4047e15bba190..072241989a2600befec260e94c84a5ad9d2253e4 100644 (file)
--- a/samples/event/event.cpp
+++ b/samples/event/event.cpp
@@ -30,7 +30,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index 24fa6808ade941ab40234ba4235cb8d09872ae0a..772b1d02dd520467f06d8e6d6dbf8797898e979e 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/flash/flash.cpp b/samples/flash/flash.cpp
index 0e6ea06593ac64a6010c501ff1beb712e27e8aca..80f45b3ca2c452730baedfb22b5f2072a87c947d 100644 (file)
--- a/samples/flash/flash.cpp
+++ b/samples/flash/flash.cpp
@@ -39,7 +39,7 @@
 #include "wx/cmdline.h"
 #include "wx/filename.h"
 
 #include "wx/cmdline.h"
 #include "wx/filename.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp
index f8cd8976e5ce04826dae131ab4062d9fbb73a87d..539a414b4b130004517b467ad50ec23dad643caa 100644 (file)
--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@@ -17,7 +17,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index aa3b4d59c4e21f65f31803634275a739d20df2a6..bc30fd739d39aff7358162c547913cbf7c6958eb 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -39,7 +39,7 @@
 
 #include "griddemo.h"
 
 
 #include "griddemo.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 9ba0461c4b6828e5954fdf357d925c606183bd86..d9708b244183e6b2471f7cbc0cb19a6cc9ba997a 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -79,7 +79,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index 9205f459963f5bc3a035ae541a403b1643e2a427..22ebb1555caaa9876929eee59eeb13e2854c8ae0 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -27,7 +27,7 @@
 #include "wx/wxhtml.h"
 #include "wx/statline.h"
 
 #include "wx/wxhtml.h"
 #include "wx/statline.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 490fdbef11428cfa743c070aa0d063537fe87196..20351cac6372c00f0568cc3088a72e9ce158a6d5 100644 (file)
--- 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"
 
 #include "wx/filesys.h"
 #include "wx/fs_zip.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 4cc6aca4e91430d8bdf562b719fef23b07e75b77..081ea3af2536e0013c7a12e395478eefab21c846 100644 (file)
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/html/webkit.h"
 
 
 #include "wx/html/webkit.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index 3fea8d49ebcc1952de91bbca7c8283973f2708bb..7d6458d9f9d8b9defa03a101a875e535e81e0f33 100644 (file)
--- 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"
 
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmprint.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index c22ce0ccfbcf84b31d288e6fe7090462a0ac7a78..58086a31d6566c3df05bc80f42454d204addcd29 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/html/htmlwin.h"
 
 
 #include "wx/html/htmlwin.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index accf15623fec4cf5b66fbf8b0b819d1a8f41cfc0..37c5f2377edf9740aaefe9052f910558f6dde955 100644 (file)
--- 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"
 
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index b403f4e45ff8fe299df20b2e11d7d192d2993e92..28afeb1d1fcb8648e3a88edf72e6b0003313664f 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -50,7 +50,7 @@
 
 #include "canvas.h"
 
 
 #include "canvas.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 99e842254208cef0537bdfdaca17ff4a6df10404..d285652e7ceeab879b28efb059c31bc283e77df4 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -37,7 +37,7 @@
 #include "wx/log.h"
 #include "wx/cmdline.h"
 
 #include "wx/log.h"
 #include "wx/cmdline.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/ipc/client.cpp b/samples/ipc/client.cpp
index 24132a36c237d24cf252c68359637e98cd859b93..a91f524d7d3e93d2a248a388a1355cff34e015b8 100644 (file)
--- a/samples/ipc/client.cpp
+++ b/samples/ipc/client.cpp
@@ -35,7 +35,7 @@
 #include "wx/datetime.h"
 #include "client.h"
 
 #include "wx/datetime.h"
 #include "client.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/ipc/server.cpp b/samples/ipc/server.cpp
index 26b09f67915a286bfddc0e55e3d7031325f52fa3..47b2d62ee6d15680cc576b207af09e84d74269ef 100644 (file)
--- 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"
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 18e7812fb86ea55c60e78b970f438fc3746d61c9..f8f478d5f937a68c4f17fcc21a049a67924d4f5c 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index b2172bef0dbf1d77bb4fc35937be5153bf5c6bd5..d90b035fdfdf49441d01cb2f8cf5b0de1f080166 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -18,7 +18,7 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 5cca8d8d71171e6c094e67f34b670f7f0738e3bc..41952f55bdfc01baec208a292de021d5ec6965d9 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -35,7 +35,7 @@
 
 #include "layout.h"
 
 
 #include "layout.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 97d3a4fef379a29969d10de04d999623c73bfb68..966cbdb9edf1597cfe9ec74fb32731a7be50e228 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -20,11 +20,11 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "bitmaps/toolbrai.xpm"
     #include "bitmaps/toolchar.xpm"
     #include "bitmaps/tooldata.xpm"
     #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);
 
     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) );
     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) );

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index e64facd67b975d99e842421e410aea6935081a4d..e68364cf01216c0a07ed7fa32ffb912aa0a3b1d8 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -32,7 +32,7 @@
 
 #include "wx/toolbar.h"
 
 
 #include "wx/toolbar.h"
 

-#if !defined(__WXMSW__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
     #include "chart.xpm"
 #endif
     #include "../sample.xpm"
     #include "chart.xpm"
 #endif

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index 91c3b575f52bb3f893743042e5ac331953dd86c1..0b56f3f53fe5fb4061fb7f230e563a0c1eaf104f 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -78,7 +78,7 @@
     wxFORCE_LINK_MODULE(wxmediabackend_wmp10)
 #endif // static wxMSW build
 
     wxFORCE_LINK_MODULE(wxmediabackend_wmp10)
 #endif // static wxMSW build
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index e4c71458d60eee459232f39fb2c44cc9df23efc1..43e33bb8019afd88006dc3242212eb97aee57637 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -22,7 +22,7 @@
 
 #include "wx/datetime.h"
 
 
 #include "wx/datetime.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index 6797e8d30a35cfabcc9655d5399d95b540fd3231..3d65f8c4e45b3901f28ffd3ccff32bb692341c67 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -59,7 +59,7 @@
 #include "copy.xpm"
 #endif
 
 #include "copy.xpm"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 289e639e7ea7c49237ef73c6dd4054973826d1d4..a78e462908be84bf2a6acba019340414f7ff813c 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index a3bb423cfd0ddd789ba009dbd78927f2ed6998be..16daebfdd8bd290105a241649918a3b1149cd280 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -24,7 +24,7 @@
 #error Sorry, this sample is only appropriate under Windows.
 #endif
 
 #error Sorry, this sample is only appropriate under Windows.
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 200ed5e34c5f1e668bcc5165ae2f93f2765ffd7a..7081f5b5654ab03219b2951ffce6fe7366cf1082 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -26,7 +26,7 @@
 #include "wx/utils.h"
 #include "notebook.h"
 
 #include "wx/utils.h"
 #include "notebook.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index 8c77063fbcdb0926181bc94195621fdfef05647c..2fdcf0d908c020b4123c59a087a3eba0d9112efc 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -40,7 +40,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index 17318f6f4fe332a1c14ca21e4df3263d4cad5547..76e7466a9f9870e320e624e6771f3238b32c49fc 100644 (file)
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -34,7 +34,7 @@
 
 #include "cube.h"
 
 
 #include "cube.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 

diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 6daf63fb311be410bcd5357c64c163bfb863c64d..4ab1ba6a3a3b3b168cbfcca649922fdf9b6b4d28 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/power/power.cpp b/samples/power/power.cpp
index 9f7d040d6bad6ffa3ceffe69c9c29581ff29dbfb..e7ad00d397122e5172620d7d6eed9c50d112a2b6 100644 (file)
--- a/samples/power/power.cpp
+++ b/samples/power/power.cpp
@@ -33,7 +33,7 @@
 
 #include "wx/power.h"
 
 
 #include "wx/power.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index b2528ed397d2ef2aa1f364b32258e8ae50945a9c..ace34b5d7f1c35b80d6e24da3e3bb4fcb45ce63c 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -51,7 +51,7 @@
 
 #include "printing.h"
 
 
 #include "printing.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp
index d506684c8413d299669c16e76b085dd90f9e622b..87ca762f8450bb174f83bd068940edc013ed5646 100644 (file)
--- a/samples/propgrid/propgrid.cpp
+++ b/samples/propgrid/propgrid.cpp
@@ -68,7 +68,7 @@
 
 #include <wx/artprov.h>
 
 
 #include <wx/artprov.h>
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/render/render.cpp b/samples/render/render.cpp
index ae5c3bc4c71e1487f50812dd24d9b32387aafee6..49e35fc1fb675174825f5d6f5d17789d96011412 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/richtext/richtext.cpp b/samples/richtext/richtext.cpp
index f75b7392bca908fd55a28091019dc141e7c0c421..d50ec7b575f176bdc75c7b9fda724cc504389ddc 100644 (file)
--- a/samples/richtext/richtext.cpp
+++ b/samples/richtext/richtext.cpp
@@ -46,7 +46,7 @@
 #include "wx/cshelp.h"
 #endif
 
 #include "wx/cshelp.h"
 #endif
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/scroll/scroll.cpp b/samples/scroll/scroll.cpp
index e89e826881e033faf3150b6593b8d99c4a71f427..d8bc171f0640ea2872b4f0e6a5135b64918af5cb 100644 (file)
--- a/samples/scroll/scroll.cpp
+++ b/samples/scroll/scroll.cpp
@@ -22,7 +22,7 @@
 #include "wx/log.h"
 #include "wx/tglbtn.h"
 
 #include "wx/log.h"
 #include "wx/tglbtn.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/shaped/shaped.cpp b/samples/shaped/shaped.cpp
index 9b05903463163b08954b8f1ad95c5afff270f378..e1e3afc17abff8bfe6f3d382a9ec742721545de9 100644 (file)
--- a/samples/shaped/shaped.cpp
+++ b/samples/shaped/shaped.cpp
@@ -41,7 +41,7 @@
 #include "wx/graphics.h"
 #include "wx/image.h"
 
 #include "wx/graphics.h"
 #include "wx/image.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index 342be4e3cfb9ba56efb419cd6a6ed05c50a664c0..30d0fa49ab495960761b84043bdb29339d06a2f8 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -39,7 +39,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 439ccc8afa30070e67117ac08a4a239da16b4d35..04b4ce33f28d6bfe534c3205678a5fd5e92aae84 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -45,7 +45,7 @@
 // --------------------------------------------------------------------------
 
 // the application icon
 // --------------------------------------------------------------------------
 
 // the application icon

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 1ec5f2b94287618d50f84198583d0ec8682d8a63..8d450699be756aff508a16658405f50b48931cae 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/splash/splash.cpp b/samples/splash/splash.cpp
index e02bf69c79f361ff712a78e3a4820798585d624c..79014bd54309f88461e0a6444e8501e795157146 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 0ed8ae07f2f506d2a74b473545cc7fdde4d8efbd..1884138e60a5a9e039bebd2963d29836007f65a6 100644 (file)
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -39,7 +39,7 @@
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 
 #include "wx/splitter.h"
 #include "wx/dcmirror.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 31a26ddfbbcbf921ded1e586ad5c9c19e2346688..e053fe164275faeef39e383c156a10e4a73239ec 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -50,7 +50,7 @@
 #include "wx/numdlg.h"
 #include "wx/fontdlg.h"
 
 #include "wx/numdlg.h"
 #include "wx/fontdlg.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 8e5de6764104a4ee03f368fbe36629ea94f7cac4..8db40419ef015d8be9011995e39fa520a8ed4446 100644 (file)
--- 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)
 //----------------------------------------------------------------------------
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 159a15cf9c0983c854a5e38bc79f78d0a6c11b4e..8e792daa71779c420bce068a5e2ac3d715e5af68 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -36,7 +36,7 @@
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"
 
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/taborder/taborder.cpp b/samples/taborder/taborder.cpp
index 39165b2d759c1a48ca8e5e906bf998e82526e235..934dedcd3d2366c3caa0ce4f3b149c4305625f13 100644 (file)
--- a/samples/taborder/taborder.cpp
+++ b/samples/taborder/taborder.cpp
@@ -39,7 +39,7 @@
 
 #include "wx/notebook.h"
 
 
 #include "wx/notebook.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index d8934e9a6e3499084c5f78debc444fd8d734aead..f5f831266627e36358026fd7f5ad9d29f586341d 100644 (file)
--- 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)
 #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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index d25968ce9e08048113dc76278a181af9b80dfb58..12662153bd1e9cc1a8eb453b57e7668803dd1cff 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -45,7 +45,7 @@
 #include "wx/numdlg.h"
 #include "wx/tokenzr.h"
 
 #include "wx/numdlg.h"
 #include "wx/tokenzr.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index 734a3d39dff2053d74fa00b81914bb9cd85f34db..172fd95ba6fca609b8588f3dc7f58ac1e3d498c0 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -60,7 +60,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 94563cad03404547dbfa74b3a9fbdcf253cef80b..229a9badb88f2ed9780e74ae4653a2a3a1105347 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -53,7 +53,7 @@
 #include "unchecked.xpm"
 #include "checked.xpm"
 
 #include "unchecked.xpm"
 #include "checked.xpm"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp
index d7b5dc9527766babe94751a9b28a0a9902d5e355..081a594e683f4dd1f3d4fd228a7b6b0ae3574dfe 100644 (file)
--- a/samples/treelist/treelist.cpp
+++ b/samples/treelist/treelist.cpp
@@ -45,7 +45,7 @@
 // Resources
 // ----------------------------------------------------------------------------
 
 // Resources
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 61a6de06dfb314f4567a82d07aae313fc3467ac1..69e074b65da1361099b0fcbede3d7a8b3374a7d6 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -25,7 +25,7 @@
 
 #include "typetest.h"
 
 
 #include "typetest.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/uiaction/uiaction.cpp b/samples/uiaction/uiaction.cpp
index 6cf4d99f6d83b1ac622f257d80ba7d977dca3c0f..3e0a7fd7b56884ce383e43083b88c2c99bb32360 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 59c9d95036d5a92e711558dc97360579df4b354b..82736d8a79c6a224d0ff103121491307c215648e 100644 (file)
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -33,7 +33,7 @@
 #include "wx/valtext.h"
 #include "wx/valnum.h"
 
 #include "wx/valtext.h"
 #include "wx/valnum.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/vscroll/vstest.cpp b/samples/vscroll/vstest.cpp
index dbacf7830e5adf61667659168e8288907674ebcc..47e2822b3cf75506aede81b7fc5c7f2ad5a63696 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/webview/webview.cpp b/samples/webview/webview.cpp
index 325111fa0074f93cfe26cf7cb8a3856c7e9675bb..de03b11709e4405fd6962e7d324a6e1b312d9f88 100644 (file)
--- a/samples/webview/webview.cpp
+++ b/samples/webview/webview.cpp
@@ -35,7 +35,7 @@
 #include "wx/filesys.h"
 #include "wx/fs_arc.h"
 
 #include "wx/filesys.h"
 #include "wx/fs_arc.h"
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/wrapsizer/wrapsizer.cpp b/samples/wrapsizer/wrapsizer.cpp
index 86d95a25f628b1c644520932bc8788f24f9c0a45..7ad2c93903b72586c4a66b96f99be39ed3fba0f8 100644 (file)
--- a/samples/wrapsizer/wrapsizer.cpp
+++ b/samples/wrapsizer/wrapsizer.cpp
@@ -21,7 +21,7 @@
 #include "wx/wrapsizer.h"
 #include "wx/artprov.h"
 
 #include "wx/wrapsizer.h"
 #include "wx/artprov.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index 2a3dfe2ccaf71968d832d8249f1afeb29854b698..6662b34597e0f5a02c1f9bed4d17fa8c29930221 100644 (file)
--- 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)
 
 // 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
 
     #include "../sample.xpm"
 #endif
 

diff --git a/samples/xti/xti.cpp b/samples/xti/xti.cpp
index 2b61783ce4699cff08dbf99cab3bc8b0f4b2daab..f67a32fbdb05ee2c932c31aec3c295cdd4014a44 100644 (file)
--- a/samples/xti/xti.cpp
+++ b/samples/xti/xti.cpp
@@ -58,7 +58,7 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-#if !defined(__WXMSW__) && !defined(__WXPM__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 

diff --git a/utils/emulator/src/emulator.cpp b/utils/emulator/src/emulator.cpp
index 2547c6255904586f51df2c63d25a78dc87fcf88b..41ef3eec8fa66e316e815f025671ac02e766d4bb 100644 (file)
--- 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)
 // ----------------------------------------------------------------------------
 
 // 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
 
     #include "emulator.xpm"
 #endif
 

diff --git a/utils/helpview/src/client.cpp b/utils/helpview/src/client.cpp
index dfcae4f0d0f7eed4f3d821ce39eb4ba4f1396fa9..bc45c5dfdc32ab39ea7e668fb69e0a9b6860ed9e 100644 (file)
--- 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>
 
 //#define wxUSE_DDE_FOR_IPC 0
 #include <wx/ipc.h>
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 

diff --git a/utils/helpview/src/remhelp.cpp b/utils/helpview/src/remhelp.cpp
index 312cd1190a7d4e7eb59bc9448ec7fe42cd6e2485..ee8da0e31bb93716557151d679970d8fb1893887 100644 (file)
--- 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
 
 //#include "ddesetup.h"
 //#define wxUSE_DDE_FOR_IPC 0
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif