Deprecate old style wxPanel ctor taking separate coordinates.

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

diff --git a/samples/memcheck/memcheck.cpp b/samples/memcheck/memcheck.cpp
index dda928f78416aea9c36e6f4d2fe42d09980e1ac6..e4c71458d60eee459232f39fb2c44cc9df23efc1 100644 (file)
--- a/samples/memcheck/memcheck.cpp
+++ b/samples/memcheck/memcheck.cpp
@@ -6,14 +6,9 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// 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"
 


@@ -27,8 +22,8 @@
 
 #include "wx/datetime.h"
 
 
 #include "wx/datetime.h"
 

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

 #endif
 
 #ifndef __WXDEBUG__
 #endif
 
 #ifndef __WXDEBUG__


@@ -61,24 +56,27 @@ 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, _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);


@@ -129,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