Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commented out _CrtSetDbgFlag yet again, restored setup.h settings.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-10-15 10:58:30 +00:00
parent d56894a83d
commit a24ce62235
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Wxwin.dsp
View File

@@ -74,7 +74,7 @@ LIB32=link.exe -lib
# Name "wxWin - Win32 Release" # Name "wxWin - Win32 Release"
# Name "wxWin - Win32 Debug" # Name "wxWin - Win32 Debug"
# Begin Group "Ressourcendateien" # Begin Group "Resources"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
# Begin Source File # Begin Source File
@@ -82,7 +82,7 @@ LIB32=link.exe -lib
SOURCE=.\include\wx\msw\wx.rc SOURCE=.\include\wx\msw\wx.rc
# End Source File # End Source File
# End Group # End Group
# Begin Group "win-dateien" # Begin Group "win-sources"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
@@ -1476,7 +1476,7 @@ SOURCE=.\include\wx\msw\wave.h
SOURCE=.\include\wx\msw\window.h SOURCE=.\include\wx\msw\window.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "generic-datein" # Begin Group "generic-sources"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
@@ -1608,7 +1608,7 @@ SOURCE=.\include\wx\generic\textdlgg.h
SOURCE=.\include\wx\generic\treectrl.h SOURCE=.\include\wx\generic\treectrl.h
# End Source File # End Source File
# End Group # End Group
# Begin Group "common-dateien" # Begin Group "common-sources"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
@@ -1803,7 +1803,7 @@ SOURCE=.\src\common\Y_tab.c
SOURCE=.\src\common\zstream.cpp SOURCE=.\src\common\zstream.cpp
# End Source File # End Source File
# End Group # End Group
# Begin Group "ole-dateien" # Begin Group "ole-sources"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File

8
include/wx/msw/setup.h
View File

@@ -114,12 +114,12 @@
#define wxUSE_DYNAMIC_CLASSES 1 #define wxUSE_DYNAMIC_CLASSES 1
// If 1, enables provision of run-time type information. // If 1, enables provision of run-time type information.
// NOW MANDATORY: don't change. // NOW MANDATORY: don't change.
#define wxUSE_MEMORY_TRACING 0 #define wxUSE_MEMORY_TRACING 1
// If 1, enables debugging versions of wxObject::new and // If 1, enables debugging versions of wxObject::new and
// wxObject::delete *IF* WXDEBUG is also defined. // wxObject::delete *IF* WXDEBUG is also defined.
// WARNING: this code may not work with all architectures, especially // WARNING: this code may not work with all architectures, especially
// if alignment is an issue. // if alignment is an issue.
#define wxUSE_DEBUG_CONTEXT 0 #define wxUSE_DEBUG_CONTEXT 1
// If 1, enables wxDebugContext, for // If 1, enables wxDebugContext, for
// writing error messages to file, etc. // writing error messages to file, etc.
// If WXDEBUG is not defined, will still use // If WXDEBUG is not defined, will still use
@@ -128,7 +128,7 @@
// since you may well need to output // since you may well need to output
// an error log in a production // an error log in a production
// version (or non-debugging beta) // version (or non-debugging beta)
#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 #define wxUSE_GLOBAL_MEMORY_OPERATORS 1
// In debug mode, cause new and delete to be redefined globally. // In debug mode, cause new and delete to be redefined globally.
// If this causes problems (e.g. link errors), set this to 0. // If this causes problems (e.g. link errors), set this to 0.
@@ -139,7 +139,7 @@
#define wxUSE_C_MAIN 0 #define wxUSE_C_MAIN 0
// Set to 1 to use main.c instead of main.cpp (UNIX only) // Set to 1 to use main.c instead of main.cpp (UNIX only)
#define wxUSE_ODBC 0 #define wxUSE_ODBC 1
// Define 1 to use ODBC classes // Define 1 to use ODBC classes
#define wxUSE_IOSTREAMH 1 #define wxUSE_IOSTREAMH 1

6
src/msw/app.cpp
View File

@@ -51,6 +51,8 @@
#endif #endif
// use debug CRT functions for memory leak detections in VC++ // use debug CRT functions for memory leak detections in VC++
/* Here we go again commenting it out. PLEASE don't
* uncomment this again.
#if defined(__WXDEBUG__) && defined(_MSC_VER) #if defined(__WXDEBUG__) && defined(_MSC_VER)
// VC++ uses this macro as debug/release mode indicator // VC++ uses this macro as debug/release mode indicator
#ifndef _DEBUG #ifndef _DEBUG
@@ -59,6 +61,7 @@
#include <crtdbg.h> #include <crtdbg.h>
#endif #endif
*/
extern char *wxBuffer; extern char *wxBuffer;
extern char *wxOsVersion; extern char *wxOsVersion;
@@ -112,12 +115,15 @@ bool wxApp::Initialize()
{ {
wxBuffer = new char[1500]; wxBuffer = new char[1500];
/* PLEASE don't uncomment this again. IT DOESN'T WORK when building
* using the makefile.
#if defined(__WXDEBUG__) && defined(_MSC_VER) #if defined(__WXDEBUG__) && defined(_MSC_VER)
// do check for memory leaks on program exit // do check for memory leaks on program exit
// (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
// deallocated memory which may be used to simulate low-memory condition) // deallocated memory which may be used to simulate low-memory condition)
_CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
#endif // debug build under MS VC++ #endif // debug build under MS VC++
*/
#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT #if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#if defined(_WINDLL) #if defined(_WINDLL)