Also reset DatePicker property editor's global pointer (fixes #11787)

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index e09ad22ba29aa0eea106b6622dce5ad644952bb4..e4c71458d60eee459232f39fb2c44cc9df23efc1 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -5,15 +5,10 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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 licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


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

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

 
 

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-#include "mondrian.xpm"
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"

 #endif
 
 #ifndef __WXDEBUG__
 #endif
 
 #ifndef __WXDEBUG__


@@ -37,7 +32,7 @@
 
 // Normally, new is automatically defined to be the
 // debugging version. If not, this does it.
 
 // 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_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS

 #define new WXDEBUG_NEW
 #endif
 
 #define new WXDEBUG_NEW
 #endif
 


@@ -61,38 +56,51 @@ IMPLEMENT_APP(MyApp)
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit(void)
 {

+  if ( !wxApp::OnInit() )
+      return false;
+

   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL);
 
   // Give it an icon
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL);
 
   // Give it an icon

-  frame->SetIcon(wxICON(mondrian));
+  frame->SetIcon(wxICON(sample));

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 

-  file_menu->Append(wxID_EXIT, "E&xit");
+  file_menu->Append(wxID_EXIT, wxT("E&xit"));

   wxMenuBar *menu_bar = new wxMenuBar;
   wxMenuBar *menu_bar = new wxMenuBar;

-  menu_bar->Append(file_menu, "File");
+  menu_bar->Append(file_menu, wxT("File"));

   frame->SetMenuBar(menu_bar);
 
   // Make a panel with a message
   wxPanel *panel = new wxPanel(frame);
 
   frame->SetMenuBar(menu_bar);
 
   // 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, wxID_ANY, wxT("Hello, this is a minimal debugging wxWidgets program!"), wxPoint(10, 10));

 
   // Show the frame
 
   // Show the frame

-  frame->Show(TRUE);
+  frame->Show(true);

 
 

+#if wxUSE_MEMORY_TRACING

   wxDebugContext::SetCheckpoint();
   wxDebugContext::SetCheckpoint();

+#endif

 
 

-  wxString *thing = new wxString;
-  wxDate* date = new wxDate;
+  // object allocation
+  wxBrush* brush = new wxBrush(*wxRED);
+  wxBitmap* bitmap = new wxBitmap(100, 100);

 
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 
 
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 

+  wxString *thing = new wxString;
+
+#if wxUSE_DATETIME
+  wxDateTime* date = new wxDateTime;
+#endif // wxUSE_DATETIME
+

   const char *data = (const char*) thing ;
 
   const char *data = (const char*) thing ;
 

+#if wxUSE_MEMORY_TRACING

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


@@ -103,13 +111,14 @@ bool MyApp::OnInit(void)
 
   // Set back to wxLogGui
   delete wxLog::SetActiveTarget(oldLog);
 
   // Set back to wxLogGui
   delete wxLog::SetActiveTarget(oldLog);

+#endif

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

-  
-  return TRUE;
+
+  return true;

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -118,12 +127,12 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent):
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent):

-  wxFrame(parent, -1, "MemCheck wxWindows Sample", wxPoint(-1, -1), wxSize(400, 200))
+  wxFrame(parent, wxID_ANY, wxT("MemCheck wxWidgets Sample"), wxDefaultPosition, wxSize(400, 200))

 {}
 
 // Intercept menu commands
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 {}
 
 // Intercept menu commands
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 }