fix dialogs sample to remember last color with generic color dialog

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index ee9b073b48f9db0ebad6d4d058327dc991a77b80..f27341e8e1b6bd817ba688d9a0aac6a9522a3ccc 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -25,9 +25,9 @@
 #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
 
@@ -78,7 +78,7 @@ bool MyApp::OnInit(void)
   // Make a panel with a message
   wxPanel *panel = new wxPanel(frame);
 
-  (void)new wxStaticText(panel, -1, "Hello, this is a minimal debugging wxWindows program!", wxPoint(10, 10));
+  (void)new wxStaticText(panel, -1, "Hello, this is a minimal debugging wxWidgets program!", wxPoint(10, 10));
 
   // Show the frame
   frame->Show(TRUE);
@@ -86,17 +86,27 @@ bool MyApp::OnInit(void)
   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 ;
 
+  // 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 objects, to force wxApp to flag a memory leak.
 //  delete thing;
 //  delete date;
@@ -111,7 +121,7 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent):
-  wxFrame(parent, -1, "MemCheck wxWindows Sample", wxPoint(-1, -1), wxSize(400, 200))
+  wxFrame(parent, -1, "MemCheck wxWidgets Sample", wxPoint(-1, -1), wxSize(400, 200))
 {}
 
 // Intercept menu commands