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 9c7cebb9ba19754d6c6b376a4620f9e9cb837126..a637d6a0a73b7c4d33870cc8d512b9db6840fe31 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -56,6 +56,9 @@ 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);
 
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL);
 


@@ -65,15 +68,15 @@ bool MyApp::OnInit(void)
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 

-  file_menu->Append(wxID_EXIT, _T("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, _T("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, wxID_ANY, _T("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);
 
   // Show the frame
   frame->Show(true);


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

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

 {}
 
 // Intercept menu commands
 {}
 
 // Intercept menu commands