From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 24 Dec 2001 16:34:51 +0000 (+0000)
Subject: don't crash if bitmaps are not found
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/17b898bb8411d6942c9181c701c864ed09ce4002

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
---

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index bd1c29c4e4..c1518e0da8 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -291,6 +291,16 @@ bool MyApp::LoadImages()
     wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK);
     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);
     gs_bmpWithColMask->SetMask(mask);
 
@@ -333,6 +343,14 @@ void MyApp::DeleteBitmaps()
     delete gs_bmp4;
     delete gs_bmp4_mono;
     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;
 }
 
 // ----------------------------------------------------------------------------