1. Empty() now doesn't free memory - Clear() does

[wxWidgets.git] / samples / memcheck / memcheck.cpp

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 713fd131d1f79c1a06d1bf06fe8fc474b063d27f..65d1cbf2359982cf8b710febccc843a71052dc26 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -31,12 +31,10 @@
 #include "mondrian.xpm"
 #endif
 
-#if !WXDEBUG
-#error You must set WXDEBUG to 1 on the 'make' command line (MSW) or with configure (GTK)
+#ifndef __WXDEBUG__
+#error This program must be compiled in debug mode.
 #endif
 
-// #define new WXDEBUG_NEW
-
 // Define a new application type
 class MyApp: public wxApp
 { public:
@@ -61,8 +59,9 @@ bool MyApp::OnInit(void)
   MyFrame *frame = new MyFrame((wxFrame *) NULL);
 
   // Give it an icon
-#ifdef wx_msw
+#ifdef __WXMSW__
   frame->SetIcon(wxIcon("mondrian"));
+#else
   frame->SetIcon(wxIcon(mondrian_xpm));
 #endif
 
@@ -83,12 +82,11 @@ bool MyApp::OnInit(void)
   frame->Show(TRUE);
 
   wxDebugContext::SetCheckpoint();
-  wxDebugContext::SetFile("debug.log");
+//  wxDebugContext::SetFile("debug.log");
 
-  wxString *thing = new wxString; // WXDEBUG_NEW wxString;
+  wxString *thing = new wxString;
   wxDate* date = new wxDate;
 
-  // Proves that defining 'new' to be 'WXDEBUG_NEW' doesn't mess up
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 
@@ -98,7 +96,7 @@ bool MyApp::OnInit(void)
   wxDebugContext::Dump();
   wxDebugContext::PrintStatistics();
 
-  // Don't delete these two objects, to force wxApp to flag a memory leak.
+  // Don't delete these objects, to force wxApp to flag a memory leak.
 //  delete thing;
 //  delete date;
 //  delete[] ordinaryNonObject;
@@ -116,7 +114,7 @@ MyFrame::MyFrame(wxFrame *parent):
 {}
 
 // Intercept menu commands
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 }