made one button label multiline for testing

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index ee9b073b48f9db0ebad6d4d058327dc991a77b80..e725baec2210ade0b02a42f0b9757c919467d618 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -25,9 +25,9 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#include "wx/date.h"
+#include "wx/datetime.h"

 
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)

 #include "mondrian.xpm"
 #endif
 
 #include "mondrian.xpm"
 #endif
 


@@ -86,17 +86,27 @@ bool MyApp::OnInit(void)
   wxDebugContext::SetCheckpoint();
 
   wxString *thing = new wxString;
   wxDebugContext::SetCheckpoint();
 
   wxString *thing = new wxString;

-  wxDate* date = new wxDate;
+
+#if wxUSE_DATETIME
+  wxDateTime* date = new wxDateTime;
+#endif // wxUSE_DATETIME

 
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 
   const char *data = (const char*) thing ;
 
 
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 
   const char *data = (const char*) thing ;
 

+  // On MSW, Dump() crashes if using wxLogGui,
+  // so use wxLogStderr instead.
+  wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
+

   wxDebugContext::PrintClasses();
   wxDebugContext::Dump();
   wxDebugContext::PrintStatistics();
 
   wxDebugContext::PrintClasses();
   wxDebugContext::Dump();
   wxDebugContext::PrintStatistics();
 

+  // Set back to wxLogGui
+  delete wxLog::SetActiveTarget(oldLog);
+

   // Don't delete these objects, to force wxApp to flag a memory leak.
 //  delete thing;
 //  delete date;
   // Don't delete these objects, to force wxApp to flag a memory leak.
 //  delete thing;
 //  delete date;