Added a few files; fixed some warnings and wxMotif compile problems

[wxWidgets.git] / include / wx / memory.h

diff --git a/include/wx/memory.h b/include/wx/memory.h
index b12620c655553f1f9c5ba55394127409f5948a5e..841ea9e410b61642e39944f545766b70d35d4dbf 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/string.h"

 
 /*
   The macro which will be expanded to include the file and line number
 
 /*
   The macro which will be expanded to include the file and line number


@@ -37,8 +38,6 @@
 #  endif
 #endif
 
 #  endif
 #endif
 

-#include "wx/string.h"
-

 #ifdef __WXDEBUG__
 
 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 #ifdef __WXDEBUG__
 
 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);


@@ -53,17 +52,25 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 #undef new
 #endif
 
 #undef new
 #endif
 

+#if defined(__SUNCC__)
+#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#elif !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
+#define wxUSE_ARRAY_MEMORY_OPERATORS 1
+#else
+#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#endif
+

 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
 
 // Added JACS 25/11/98: needed for some compilers
 void * operator new (size_t size);
 

-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+#if wxUSE_ARRAY_MEMORY_OPERATORS

 void * operator new[] (size_t size);
 #endif
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
 void * operator new[] (size_t size);
 #endif
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 

-#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )
+#if wxUSE_ARRAY_MEMORY_OPERATORS

 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif
 void * operator new[] (size_t size, char * fileName, int lineNum);
 void operator delete[] (void * buf);
 #endif


@@ -75,7 +82,9 @@ void operator delete[](void *buf, char*, int);
 #endif
 
 #endif
 #endif
 
 #endif

+  // wxUSE_GLOBAL_MEMORY_OPERATORS

 #endif
 #endif

+  // __WXDEBUG__

 
 typedef unsigned int wxMarkerType;
 
 
 typedef unsigned int wxMarkerType;