bitmap mask corrections for Mac OS

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

diff --git a/demos/life/dialogs.cpp b/demos/life/dialogs.cpp
index 70e6a347166e73b11390307f11c835aacdffc9fd..635aa75da1bea83d5f1ac29a0aedaf7a4c9b0b56 100644 (file)
--- a/demos/life/dialogs.cpp
+++ b/demos/life/dialogs.cpp
@@ -172,7 +172,7 @@ LifeAboutDialog::LifeAboutDialog(wxWindow *parent)
 {
     // logo
     wxBitmap bmp = wxBITMAP(life);
-#if !defined(__WXGTK__) && !defined(__WXMOTIF__)
+#if !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXMAC__)
     bmp.SetMask(new wxMask(bmp, *wxBLUE));
 #endif
     wxStaticBitmap *sbmp = new wxStaticBitmap(this, -1, bmp);

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 0043a399cc99cf43f5bcd02f5e506d764eff7686..b7df5569d79ff8c3e642c2a7117530632a788172 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -602,7 +602,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
         bmpe = wxBITMAP(east),  
         bmps = wxBITMAP(south);
 
-#if !defined(__WXGTK__) && !defined(__WXMOTIF__)
+#if !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXMAC__)
     bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
     bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY));
     bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY));