From 83661a1347733ddad2a7c264f920658e3095ff13 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 30 Jun 2001 11:07:42 +0000 Subject: [PATCH] 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 --- samples/caret/caret.cpp | 2 +- samples/controls/controls.cpp | 2 +- samples/dragimag/dragimag.cpp | 2 +- samples/drawing/drawing.cpp | 2 +- samples/erase/erase.cpp | 4 ++-- samples/help/demo.cpp | 2 +- samples/internat/internat.cpp | 2 +- samples/minimal/minimal.cpp | 2 +- samples/propsize/propsize.cpp | 2 +- samples/typetest/typetest.cpp | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp index 760b54a830..600c6e5b0d 100644 --- a/samples/caret/caret.cpp +++ b/samples/caret/caret.cpp @@ -30,7 +30,7 @@ // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp index bb4c790817..9a425672bb 100644 --- a/samples/controls/controls.cpp +++ b/samples/controls/controls.cpp @@ -34,7 +34,7 @@ #include "wx/tooltip.h" #endif -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #define USE_XPM #endif diff --git a/samples/dragimag/dragimag.cpp b/samples/dragimag/dragimag.cpp index e803877a1e..7be138f0c1 100644 --- a/samples/dragimag/dragimag.cpp +++ b/samples/dragimag/dragimag.cpp @@ -36,7 +36,7 @@ #include "dragimag.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #include "dragicon.xpm" #endif diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 61fed0ce1e..0e8f8ee757 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -43,7 +43,7 @@ // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif diff --git a/samples/erase/erase.cpp b/samples/erase/erase.cpp index dde8738687..2e93bae7e6 100644 --- a/samples/erase/erase.cpp +++ b/samples/erase/erase.cpp @@ -39,7 +39,7 @@ // resources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif @@ -157,7 +157,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) 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); diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp index daba593c1a..3c43002659 100644 --- a/samples/help/demo.cpp +++ b/samples/help/demo.cpp @@ -71,7 +71,7 @@ // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp index ab08456a6b..50c84b9dfe 100644 --- a/samples/internat/internat.cpp +++ b/samples/internat/internat.cpp @@ -29,7 +29,7 @@ #include "wx/file.h" #include "wx/log.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp index b2ee183574..55d27665ec 100644 --- a/samples/minimal/minimal.cpp +++ b/samples/minimal/minimal.cpp @@ -39,7 +39,7 @@ // resources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif diff --git a/samples/propsize/propsize.cpp b/samples/propsize/propsize.cpp index 2189f89910..beadaeb29d 100644 --- a/samples/propsize/propsize.cpp +++ b/samples/propsize/propsize.cpp @@ -40,7 +40,7 @@ // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp index 03d9ff3f62..bb0e047620 100644 --- a/samples/typetest/typetest.cpp +++ b/samples/typetest/typetest.cpp @@ -31,7 +31,7 @@ #include "typetest.h" -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) #include "mondrian.xpm" #endif -- 2.45.2