From: Julian Smart <julian@anthemion.co.uk>
Date: Wed, 1 Dec 2004 12:50:24 +0000 (+0000)
Subject: Allow memcheck.cpp to be compiled without wxDebugContext (for e.g. testing
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ea787af19686a110bb83b23c9471b91db26190d1?hp=68d411dc5724b9284455a31ef8a8d6d99c18d224

Allow memcheck.cpp to be compiled without wxDebugContext (for e.g. testing
using other leak checkers).


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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index f27341e8e1..1fd5393331 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -37,7 +37,7 @@
 
 // Normally, new is automatically defined to be the
 // debugging version. If not, this does it.
-#if !defined(new) && defined(WXDEBUG_NEW)
+#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_DEBUG_CONTEXT
 #define new WXDEBUG_NEW
 #endif
 
@@ -83,7 +83,16 @@ bool MyApp::OnInit(void)
   // Show the frame
   frame->Show(TRUE);
 
+#if wxUSE_DEBUG_CONTEXT
   wxDebugContext::SetCheckpoint();
+#endif
+
+  // object allocation
+  wxBrush* brush = new wxBrush(*wxRED);
+  wxBitmap* bitmap = new wxBitmap(100, 100);
+
+  // non-object allocation
+  char *ordinaryNonObject = new char[1000];
 
   wxString *thing = new wxString;
 
@@ -91,11 +100,9 @@ bool MyApp::OnInit(void)
   wxDateTime* date = new wxDateTime;
 #endif // wxUSE_DATETIME
 
-  // non-object allocation
-  char *ordinaryNonObject = new char[1000];
-
   const char *data = (const char*) thing ;
 
+#if wxUSE_DEBUG_CONTEXT
   // On MSW, Dump() crashes if using wxLogGui,
   // so use wxLogStderr instead.
   wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
@@ -106,6 +113,7 @@ bool MyApp::OnInit(void)
 
   // Set back to wxLogGui
   delete wxLog::SetActiveTarget(oldLog);
+#endif
 
   // Don't delete these objects, to force wxApp to flag a memory leak.
 //  delete thing;