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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index c550dcd5bf88dec257d6e8d4710956d7ab59b420..aa3f3a7af471d1422f3d34901730bcb9cea1aa1c 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -467,6 +467,17 @@ samples/docview/*.txt
 samples/docview/*.ico
 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/*.cpp
 samples/memcheck/*.def

diff --git a/include/wx/memory.h b/include/wx/memory.h
index c6ee00a4e035ef8260d72c5b246a236895a493b4..b12620c655553f1f9c5ba55394127409f5948a5e 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -55,7 +55,10 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
+
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void * operator new[] (size_t size);
+#endif
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 602a295bb86ab892db61ad98cc9427621cc5f5e8..3f8ea5028d1dfbccd4d78e93966b83bf89118e51 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -965,6 +965,7 @@ void * operator new (size_t size)
 #endif
 }
 
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void * operator new[] (size_t size)
 {
 #ifdef NO_DEBUG_ALLOCATION
@@ -973,6 +974,7 @@ void * operator new[] (size_t size)
   return wxDebugAlloc(size, NULL, 0, FALSE, TRUE);
 #endif
 }
+#endif
 
 #if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
 void * operator new[] (size_t size, char * fileName, int lineNum)