include xpm files for Mac OS after correction of wxICON macro

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 760b54a8307d78d02c544b4ce9bdca315e1b78e8..600c6e5b0df66a7763ccdbecc4e0f9aec8bed109 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -30,7 +30,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index bb4c79081747b1da65c56c14e24b416dc455e1e4..9a425672bba3ca15f717c3078a8300623a6b9245 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -34,7 +34,7 @@
     #include "wx/tooltip.h"
 #endif
 
     #include "wx/tooltip.h"
 #endif
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

     #define USE_XPM
 #endif
 
     #define USE_XPM
 #endif
 

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

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 61fed0ce1ed109db00643533bc707bcb77be1642..0e8f8ee757c7c37b91730e9d8c2daf72a637b5c7 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -43,7 +43,7 @@
 // ----------------------------------------------------------------------------
 
 // the application icon
 // ----------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp
index dde8738687f4f3da7728151566201f0bef85a09f..2e93bae7e663889a2d7da5349cc4f77447d56426 100644 (file)
--- a/samples/erase/erase.cpp
+++ b/samples/erase/erase.cpp
@@ -39,7 +39,7 @@
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
 // resources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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


@@ -157,7 +157,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;

-    msg.Printf( _T("This is the about dialog of tghe Erase sample.\n")
+    msg.Printf( _T("This is the about dialog of the Erase sample.\n")

                 _T("Welcome to %s"), wxVERSION_STRING);
 
     wxMessageBox(msg, "About Erase", wxOK | wxICON_INFORMATION, this);
                 _T("Welcome to %s"), wxVERSION_STRING);
 
     wxMessageBox(msg, "About Erase", wxOK | wxICON_INFORMATION, this);

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index daba593c1aee151679e3dfa7cb2a882f3b310ff7..3c430026592f55cd0023852038c1941e1ff809f0 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -71,7 +71,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index ab08456a6b489cbf52e5bf7519ccc8aa4ab4aaba..50c84b9dfe6d696f2067cfa00c3ae805ad5c959b 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -29,7 +29,7 @@
 #include "wx/file.h"
 #include "wx/log.h"
 
 #include "wx/file.h"
 #include "wx/log.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index b2ee1835745540f87a667ada9480348c006857c2..55d27665ecc77bd72c664e204a42fdc2ffbbdaec 100644 (file)
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -39,7 +39,7 @@
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
 // resources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/propsize/propsize.cpp b/samples/propsize/propsize.cpp
index 2189f89910653cb5a5bd229383fbcbd0cc08f431..beadaeb29d49499149d13ca62b78e6293a48ae80 100644 (file)
--- a/samples/propsize/propsize.cpp
+++ b/samples/propsize/propsize.cpp
@@ -40,7 +40,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index 03d9ff3f6249087fbcff5d19fd8d59c1d1461699..bb0e047620704b3941bdf52a8310a78a98f311ac 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -31,7 +31,7 @@
 
 #include "typetest.h"
 
 
 #include "typetest.h"
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)

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