X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/880d870ea4133fc81dff875d54d14f1e9bb0268f..4e3ad7c095f0a047b48445d76316fc20f394f3e9:/contrib/samples/canvas/simple/simple.cpp

diff --git a/contrib/samples/canvas/simple/simple.cpp b/contrib/samples/canvas/simple/simple.cpp
index bc1516c41e..46385b28f1 100644
--- a/contrib/samples/canvas/simple/simple.cpp
+++ b/contrib/samples/canvas/simple/simple.cpp
@@ -20,7 +20,7 @@
 #include "simple.h"
 
 // Include icon header
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 
@@ -71,7 +71,7 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
 
     // Bunch of rects and images.
     wxBitmap bitmap( smile_xpm );
-    wxImage image( bitmap );
+    wxImage image( bitmap.ConvertToImage() );
 
     m_smile1 = new wxCanvasImage( image, 0,70,32,32 );
     root->Append( m_smile1 );