X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/46dc76ba3573649a9ed7c7aff6dc677f533eee11..1b21409b36057d8281675973a7c3a1d77d9c0ddb:/samples/memcheck/memcheck.cpp

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 4b1be5acf3..54712a16f4 100644
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -25,13 +25,21 @@
 #include "wx/wx.h"
 #endif
 
-#include "wx/date.h"
+#include "wx/datetime.h"
 
-#if !WXDEBUG
-#error You must set WXDEBUG to 1 on the 'make' command line or make.env.
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#include "mondrian.xpm"
 #endif
 
-// #define new WXDEBUG_NEW
+#ifndef __WXDEBUG__
+#error This program must be compiled in debug mode.
+#endif
+
+// Normally, new is automatically defined to be the
+// debugging version. If not, this does it.
+#if !defined(new) && defined(WXDEBUG_NEW)
+#define new WXDEBUG_NEW
+#endif
 
 // Define a new application type
 class MyApp: public wxApp
@@ -54,15 +62,10 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit(void)
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL);
+  MyFrame *frame = new MyFrame((wxFrame *) NULL);
 
   // Give it an icon
-#ifdef wx_msw
-  frame->SetIcon(wxIcon("mondrian"));
-#endif
-#ifdef wx_x
-  frame->SetIcon(wxIcon("mondrian.xbm"));
-#endif
+  frame->SetIcon(wxICON(mondrian));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -80,23 +83,31 @@ bool MyApp::OnInit(void)
   // Show the frame
   frame->Show(TRUE);
 
-//  wxDebugContext::SetCheckpoint();
-//  wxDebugContext::SetFile("debug.log");
+  wxDebugContext::SetCheckpoint();
+
+  wxString *thing = new wxString;
 
-  wxString *thing = new wxString; // WXDEBUG_NEW wxString;
-  wxDate* date = new wxDate;
+#if wxUSE_DATETIME
+  wxDateTime* date = new wxDateTime;
+#endif // wxUSE_DATETIME
 
-  // Proves that defining 'new' to be 'WXDEBUG_NEW' doesn't mess up
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 
   const char *data = (const char*) thing ;
 
-//  wxDebugContext::PrintClasses();
-//  wxDebugContext::Dump();
-//  wxDebugContext::PrintStatistics();
+  // On MSW, Dump() crashes if using wxLogGui,
+  // so use wxLogStderr instead.
+  wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
+
+  wxDebugContext::PrintClasses();
+  wxDebugContext::Dump();
+  wxDebugContext::PrintStatistics();
+
+  // Set back to wxLogGui
+  delete wxLog::SetActiveTarget(oldLog);
 
-  // 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;
@@ -114,7 +125,7 @@ MyFrame::MyFrame(wxFrame *parent):
 {}
 
 // Intercept menu commands
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 }