projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use explicit virtual keyword with overridden virtual methods
[wxWidgets.git]
/
samples
/
memcheck
/
memcheck.cpp
diff --git
a/samples/memcheck/memcheck.cpp
b/samples/memcheck/memcheck.cpp
index e725baec2210ade0b02a42f0b9757c919467d618..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$
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#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"
@@
-37,7
+32,7
@@
// Normally, new is automatically defined to be the
// debugging version. If not, this does it.
// Normally, new is automatically defined to be the
// debugging version. If not, this does it.
-#if !defined(new) && defined(WXDEBUG_NEW)
+#if !defined(new) && defined(WXDEBUG_NEW)
&& wxUSE_MEMORY_TRACING && wxUSE_GLOBAL_MEMORY_OPERATORS
#define new WXDEBUG_NEW
#endif
#define new WXDEBUG_NEW
#endif
@@
-70,20
+65,29
@@
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,
"E&xit"
);
+ file_menu->Append(wxID_EXIT,
_T("E&xit")
);
wxMenuBar *menu_bar = new wxMenuBar;
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);
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
// Show the frame
- frame->Show(
TRUE
);
+ frame->Show(
true
);
+#if wxUSE_MEMORY_TRACING
wxDebugContext::SetCheckpoint();
wxDebugContext::SetCheckpoint();
+#endif
+
+ // 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;
wxString *thing = new wxString;
@@
-91,11
+95,9
@@
bool MyApp::OnInit(void)
wxDateTime* date = new wxDateTime;
#endif // wxUSE_DATETIME
wxDateTime* date = new wxDateTime;
#endif // wxUSE_DATETIME
- // non-object allocation
- char *ordinaryNonObject = new char[1000];
-
const char *data = (const char*) thing ;
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);
// On MSW, Dump() crashes if using wxLogGui,
// so use wxLogStderr instead.
wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
@@
-106,13
+108,14
@@
bool MyApp::OnInit(void)
// Set back to wxLogGui
delete wxLog::SetActiveTarget(oldLog);
// 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;
// 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)
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@
-121,12
+124,12
@@
END_EVENT_TABLE()
// My frame constructor
MyFrame::MyFrame(wxFrame *parent):
// 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& WXUNUSED(event))
{
{}
// Intercept menu commands
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
- Close(
TRUE
);
+ Close(
true
);
}
}