diff --git a/Makefile.in b/Makefile.in index 9b6c72186e..20a29f234e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1195,7 +1195,7 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/rotate/Makefile.in $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/makefile.unx $(DISTDIR)/samples/rotate cp $(SAMPDIR)/rotate/*.cpp $(DISTDIR)/samples/rotate - cp $(SAMPDIR)/rotate/*.bmp $(DISTDIR)/samples/rotate + cp $(SAMPDIR)/rotate/*.png $(DISTDIR)/samples/rotate mkdir $(DISTDIR)/samples/richedit cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit diff --git a/samples/rotate/Makefile.in b/samples/rotate/Makefile.in index 204803efa3..20b835ba93 100644 --- a/samples/rotate/Makefile.in +++ b/samples/rotate/Makefile.in @@ -18,7 +18,7 @@ PROGRAM=rotate OBJECTS =$(PROGRAM).o DEPFILES=$(PROGRAM).d -DATAFILES=kclub.bmp +DATAFILES=duck.png include ../../src/makeprog.env diff --git a/samples/rotate/kclub.bmp b/samples/rotate/kclub.bmp deleted file mode 100644 index 2a4aa03a4b..0000000000 Binary files a/samples/rotate/kclub.bmp and /dev/null differ diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp index c7eacc7ef7..00abdfebe2 100644 --- a/samples/rotate/rotate.cpp +++ b/samples/rotate/rotate.cpp @@ -89,10 +89,11 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { - m_image = wxImage(_T("kclub.bmp"), wxBITMAP_TYPE_BMP); +#if wxUSE_LIBPNG + wxImage::AddHandler( new wxPNGHandler ); +#endif - // any unused colour will do - m_image.SetMaskColour( 0, 255, 255 ); + m_image = wxImage(_T("duck.png"), wxBITMAP_TYPE_PNG); if ( !m_image.Ok() ) {