Fixed a trivial error.

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 026f8d053210dc160732084750b33d1f8f95eee4..44f024be6b5a953d091ea05c3953ec5da19ec5ae 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -35,8 +35,6 @@
 #error You must set WXDEBUG to 1 on the 'make' command line (MSW) or with configure (GTK)
 #endif
 
-// #define new WXDEBUG_NEW
-
 // Define a new application type
 class MyApp: public wxApp
 { public:
@@ -58,11 +56,12 @@ 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
+#ifdef __WXMSW__
   frame->SetIcon(wxIcon("mondrian"));
+#else
   frame->SetIcon(wxIcon(mondrian_xpm));
 #endif
 
@@ -85,10 +84,9 @@ bool MyApp::OnInit(void)
   wxDebugContext::SetCheckpoint();
   wxDebugContext::SetFile("debug.log");
 
-  wxString *thing = new wxString; // WXDEBUG_NEW wxString;
+  wxString *thing = new wxString;
   wxDate* date = new wxDate;
 
-  // Proves that defining 'new' to be 'WXDEBUG_NEW' doesn't mess up
   // non-object allocation
   char *ordinaryNonObject = new char[1000];
 
@@ -116,7 +114,7 @@ MyFrame::MyFrame(wxFrame *parent):
 {}
 
 // Intercept menu commands
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 }