Unix compilation fixes after last commit

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 2c0f39843957c3e14e3fcd9ce330d18d51f588da..9c7cebb9ba19754d6c6b376a4620f9e9cb837126 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$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -25,14 +20,20 @@
 #include "wx/wx.h"
 #endif
 
-#include "wx/date.h"
+#include "wx/datetime.h"
 
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #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
+
+// Normally, new is automatically defined to be the
+// debugging version. If not, this does it.
+#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS
+#define new WXDEBUG_NEW
 #endif
 
 // Define a new application type
@@ -59,48 +60,62 @@ bool MyApp::OnInit(void)
   MyFrame *frame = new MyFrame((wxFrame *) NULL);
 
   // Give it an icon
-#ifdef wx_msw
-  frame->SetIcon(wxIcon("mondrian"));
-  frame->SetIcon(wxIcon(mondrian_xpm));
-#endif
+  frame->SetIcon(wxICON(mondrian));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
-  file_menu->Append(wxID_EXIT, "E&xit");
+  file_menu->Append(wxID_EXIT, _T("E&xit"));
   wxMenuBar *menu_bar = new wxMenuBar;
-  menu_bar->Append(file_menu, "File");
+  menu_bar->Append(file_menu, _T("File"));
   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, _T("Hello, this is a minimal debugging wxWidgets program!"), wxPoint(10, 10));
 
   // Show the frame
-  frame->Show(TRUE);
+  frame->Show(true);
 
+#if wxUSE_MEMORY_TRACING
   wxDebugContext::SetCheckpoint();
-  wxDebugContext::SetFile("debug.log");
+#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];
 
+  wxString *thing = new wxString;
+
+#if wxUSE_DATETIME
+  wxDateTime* date = new wxDateTime;
+#endif // wxUSE_DATETIME
+
   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);
+
   wxDebugContext::PrintClasses();
   wxDebugContext::Dump();
   wxDebugContext::PrintStatistics();
 
-  // Don't delete these two objects, to force wxApp to flag a memory leak.
+  // 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;
-  
-  return TRUE;
+
+  return true;
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -109,12 +124,12 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent):
-  wxFrame(parent, -1, "MemCheck wxWindows Sample", wxPoint(-1, -1), wxSize(400, 200))
+  wxFrame(parent, wxID_ANY, _T("MemCheck wxWidgets Sample"), wxDefaultPosition, wxSize(400, 200))
 {}
 
 // Intercept menu commands
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }