#include "wx/date.h"
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
#include "mondrian.xpm"
#endif
-#if !WXDEBUG
-#error You must set WXDEBUG to 1 on the 'make' command line (MSW) or with configure (GTK)
+#ifndef __WXDEBUG__
+#error This program must be compiled in debug mode.
#endif
-// #define new WXDEBUG_NEW
+// Normally, new is automatically defined to be the
+// debugging version. If not, this does it.
+#if !defined(new) && defined(WXDEBUG_NEW)
+#define new WXDEBUG_NEW
+#endif
// Define a new application type
class MyApp: public wxApp
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
- frame->SetIcon(wxIcon("mondrian"));
- frame->SetIcon(wxIcon(mondrian_xpm));
-#endif
+ frame->SetIcon(wxICON(mondrian));
// Make a menubar
wxMenu *file_menu = new wxMenu;
frame->Show(TRUE);
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];
const char *data = (const char*) thing ;
+ // On MSW, Dump() crashes if using wxLogGui,
+ // so use wxLogStderr instead.
+ wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
+
wxDebugContext::PrintClasses();
wxDebugContext::Dump();
wxDebugContext::PrintStatistics();
- // Don't delete these two objects, to force wxApp to flag a memory leak.
+ // Set back to wxLogGui
+ delete wxLog::SetActiveTarget(oldLog);
+
+ // Don't delete these objects, to force wxApp to flag a memory leak.
// delete thing;
// delete date;
// delete[] ordinaryNonObject;
{}
// Intercept menu commands
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
Close(TRUE);
}