Use template class instead of template function in wxVectorSort().

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index 1fd5393331ccd39dbae7402a77e34b6d56825182..a637d6a0a73b7c4d33870cc8d512b9db6840fe31 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -9,11 +9,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -37,7 +32,7 @@
 
 // Normally, new is automatically defined to be the
 // debugging version. If not, this does it.
-#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_DEBUG_CONTEXT
+#if !defined(new) && defined(WXDEBUG_NEW) && wxUSE_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS
 #define new WXDEBUG_NEW
 #endif
 
@@ -61,6 +56,9 @@ IMPLEMENT_APP(MyApp)
 // `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);
 
@@ -70,20 +68,20 @@ bool MyApp::OnInit(void)
   // 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;
-  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);
 
-  (void)new wxStaticText(panel, -1, "Hello, this is a minimal debugging wxWidgets 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
-  frame->Show(TRUE);
+  frame->Show(true);
 
-#if wxUSE_DEBUG_CONTEXT
+#if wxUSE_MEMORY_TRACING
   wxDebugContext::SetCheckpoint();
 #endif
 
@@ -102,7 +100,7 @@ bool MyApp::OnInit(void)
 
   const char *data = (const char*) thing ;
 
-#if wxUSE_DEBUG_CONTEXT
+#if wxUSE_MEMORY_TRACING
   // On MSW, Dump() crashes if using wxLogGui,
   // so use wxLogStderr instead.
   wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
@@ -119,8 +117,8 @@ bool MyApp::OnInit(void)
 //  delete thing;
 //  delete date;
 //  delete[] ordinaryNonObject;
-  
-  return TRUE;
+
+  return true;
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -129,12 +127,12 @@ END_EVENT_TABLE()
 
 // My frame constructor
 MyFrame::MyFrame(wxFrame *parent):
-  wxFrame(parent, -1, "MemCheck wxWidgets 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))
 {
-    Close(TRUE);
+    Close(true);
 }