OGL fixes for wxMotif; added Set/GetClientData to wxMenu in wxMSW/wxMotif/wxStubs.

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

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 9a17ad3ac99fc896b5be307f8ef0930b0eca221a..4a4117e410b4ce97044673203fe69dc10700de67 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -23,23 +23,28 @@
   info, or to be a straight call to the new operator.
 */
 
   info, or to be a straight call to the new operator.
 */
 

-#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
+#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

 
 #include <stddef.h>
 
 
 #include <stddef.h>
 

-#if USE_IOSTREAMH
-#include <iostream.h>
+#if wxUSE_IOSTREAMH
+// N.B. BC++ doesn't have istream.h, ostream.h
+#  include <iostream.h>

 #else
 #else

-#include <iostream>
+#  include <ostream>
+#  ifdef _MSC_VER
+      using namespace std;
+#  endif

 #endif
 
 #include "wx/string.h"
 
 #endif
 
 #include "wx/string.h"
 

-#ifndef WXDEBUG_NEW
-#define WXDEBUG_NEW new(__FILE__,__LINE__)
-#endif
-

 #if WXDEBUG
 #if WXDEBUG

+
+// #ifndef WXDEBUG_NEW
+// #define WXDEBUG_NEW new(__FILE__,__LINE__)
+// #endif
+

 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 void wxDebugFree(void * buf, bool isVect = FALSE);
 
 void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE);
 void wxDebugFree(void * buf, bool isVect = FALSE);
 


@@ -47,7 +52,7 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 // Currently, these merely call malloc and free; only the wxObject
 // operators do something interesting. But this allows WXDEBUG_NEW to
 // work for all 'new's in a file.
 // Currently, these merely call malloc and free; only the wxObject
 // operators do something interesting. But this allows WXDEBUG_NEW to
 // work for all 'new's in a file.

-#if USE_GLOBAL_MEMORY_OPERATORS
+#if wxUSE_GLOBAL_MEMORY_OPERATORS

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -56,13 +61,16 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 
 void * operator new (size_t size, char * fileName, int lineNum);
 void operator delete (void * buf);
 

-#if !( defined (_MSC_VER) && (_MSC_VER <= 1000) )
+// VC++ 6.0
+#if _MSC_VER >= 1200
+void operator delete(void *buf, char*, int);
+#endif
+
+#if !( defined (_MSC_VER) && (_MSC_VER <= 1020) )

 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
 

-#define new WXDEBUG_NEW
-

 #endif
 #endif
 
 #endif
 #endif
 


@@ -270,7 +278,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 
 #define WXTRACE TRUE ? (void)0 : wxTrace
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
 
 #define WXTRACE TRUE ? (void)0 : wxTrace
 #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel

-#define WXDEBUG_NEW new
+// #define WXDEBUG_NEW new

 
 #endif // WXDEBUG
 
 
 #endif // WXDEBUG