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

VC++ 4 fixes and added docvwmdi to distribution files.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-09 18:23:39 +00:00
parent 94f52d90c9
commit 30c710fd9d
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/msw/generic.rsp
View File

@@ -467,6 +467,17 @@ samples/docview/*.txt
samples/docview/*.ico samples/docview/*.ico
samples/docview/*.bmp samples/docview/*.bmp
samples/docvwmdi/*.h
samples/docvwmdi/*.cpp
samples/docvwmdi/*.def
samples/docvwmdi/*.rc
samples/docvwmdi/makefile*
samples/docvwmdi/*.xbm
samples/docvwmdi/*.xpm
samples/docvwmdi/*.txt
samples/docvwmdi/*.ico
samples/docvwmdi/*.bmp
samples/memcheck/*.h samples/memcheck/*.h
samples/memcheck/*.cpp samples/memcheck/*.cpp
samples/memcheck/*.def samples/memcheck/*.def

3
include/wx/memory.h
View File

@@ -55,7 +55,10 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
// Added JACS 25/11/98: needed for some compilers // Added JACS 25/11/98: needed for some compilers
void * operator new (size_t size); void * operator new (size_t size);
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
void * operator new[] (size_t size); void * operator new[] (size_t size);
#endif
void * operator new (size_t size, char * fileName, int lineNum); void * operator new (size_t size, char * fileName, int lineNum);
void operator delete (void * buf); void operator delete (void * buf);

2
src/common/memory.cpp
View File

@@ -965,6 +965,7 @@ void * operator new (size_t size)
#endif #endif
} }
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
void * operator new[] (size_t size) void * operator new[] (size_t size)
{ {
#ifdef NO_DEBUG_ALLOCATION #ifdef NO_DEBUG_ALLOCATION
@@ -973,6 +974,7 @@ void * operator new[] (size_t size)
return wxDebugAlloc(size, NULL, 0, FALSE, TRUE); return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
#endif #endif
} }
#endif
#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
void * operator new[] (size_t size, char * fileName, int lineNum) void * operator new[] (size_t size, char * fileName, int lineNum)