Don't start logging window in debug builds under windows (we use the MSVC debugger window instead).

Added (commented out) memory leak detection to AudacityHeaders.h
This commit is contained in:
james.k.crook@gmail.com 2012-03-19 17:54:52 +00:00
parent db38d6049d
commit 4403da58ff
2 changed files with 26 additions and 5 deletions

View File

@ -101,6 +101,7 @@ It handles initialization and termination by subclassing wxApp.
#include "effects/ScoreAlignDialog.h"
#endif
#if 0
#ifdef _DEBUG
#ifdef _MSC_VER
#undef THIS_FILE
@ -108,6 +109,7 @@ It handles initialization and termination by subclassing wxApp.
#define new new(_NORMAL_BLOCK, THIS_FILE, __LINE__)
#endif
#endif
#endif
// Windows specific linker control...only needed once so
// this is a good place (unless we want to add another file).
@ -1005,12 +1007,16 @@ bool AudacityApp::OnInit()
}
#endif
// JKC: On windows, we only want a logger in release builds.
mLogger=NULL;
#ifndef __WXMAC__
mLogger = new wxLogWindow(NULL, wxT("Audacity Log"), false, false);
mLogger->SetActiveTarget(mLogger);
mLogger->EnableLogging(true);
mLogger->SetLogLevel(wxLOG_Max);
wxLogMessage(wxString::Format(wxT("Audacity %s"), AUDACITY_VERSION_STRING));
#ifndef _DEBUG
mLogger = new wxLogWindow(NULL, wxT("Audacity Log"), false, false);
mLogger->SetActiveTarget(mLogger);
mLogger->EnableLogging(true);
mLogger->SetLogLevel(wxLOG_Max);
wxLogMessage(wxString::Format(wxT("Audacity %s"), AUDACITY_VERSION_STRING));
#endif
#endif
// Unused strings that we want to be translated, even though

View File

@ -72,3 +72,18 @@
#include "widgets/ProgressDialog.h"
#include "widgets/Ruler.h"
//#ifdef __WXMSW__
// Enable this to diagnose memory leaks too!
// #include <wx/msw/msvcrt.h> // redefines the new() operator
//#endif
#if 0
#define _DEBUG
#ifdef _DEBUG
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
#define new DEBUG_NEW
#endif
#endif