don't crash if bitmaps are not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -291,6 +291,16 @@ bool MyApp::LoadImages()
|
|||||||
wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK);
|
wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK);
|
||||||
gs_bmpWithMask->SetMask(mask);
|
gs_bmpWithMask->SetMask(mask);
|
||||||
|
|
||||||
|
{
|
||||||
|
wxStopWatch sw;
|
||||||
|
wxMask m;
|
||||||
|
for ( int i = 0; i < 1000; i++ )
|
||||||
|
{
|
||||||
|
m.Create(*gs_bmpWithColMask, *wxWHITE);
|
||||||
|
}
|
||||||
|
wxLogMessage("Total time: %ldms", sw.Time());
|
||||||
|
}
|
||||||
|
|
||||||
mask = new wxMask(*gs_bmpWithColMask, *wxWHITE);
|
mask = new wxMask(*gs_bmpWithColMask, *wxWHITE);
|
||||||
gs_bmpWithColMask->SetMask(mask);
|
gs_bmpWithColMask->SetMask(mask);
|
||||||
|
|
||||||
@@ -333,6 +343,14 @@ void MyApp::DeleteBitmaps()
|
|||||||
delete gs_bmp4;
|
delete gs_bmp4;
|
||||||
delete gs_bmp4_mono;
|
delete gs_bmp4_mono;
|
||||||
delete gs_bmp36;
|
delete gs_bmp36;
|
||||||
|
|
||||||
|
gs_bmpNoMask = NULL;
|
||||||
|
gs_bmpWithColMask = NULL;
|
||||||
|
gs_bmpMask = NULL;
|
||||||
|
gs_bmpWithMask = NULL;
|
||||||
|
gs_bmp4 = NULL;
|
||||||
|
gs_bmp4_mono = NULL;
|
||||||
|
gs_bmp36 = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user