fixes for operator new declaration/definition (patch 549349)

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

diff --git a/include/wx/object.h b/include/wx/object.h
index 54df87ed098481916c4419a513f1d3e2a2896958..5b06ab786fcd2f660046297ec862561c3da4e5a2 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -411,7 +411,7 @@ public:
     // Turn on the correct set of new and delete operators
 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
     // Turn on the correct set of new and delete operators
 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT

-    void *operator new ( size_t size, wxChar *fileName = NULL, int lineNum = 0 );
+    void *operator new ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 );

 #endif
 
 #ifdef _WX_WANT_DELETE_VOID
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID


@@ -423,11 +423,11 @@ public:
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT

-    void operator delete ( void *buf, wxChar*, int );
+    void operator delete ( void *buf, const wxChar*, int );

 #endif
 
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
 #endif
 
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT

-    void *operator new[] ( size_t size, wxChar *fileName = NULL, int lineNum = 0 );
+    void *operator new[] ( size_t size, const wxChar *fileName = NULL, int lineNum = 0 );

 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID


@@ -435,7 +435,7 @@ public:
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT

-    void operator delete[] (void* buf, wxChar*, int );
+    void operator delete[] (void* buf, const wxChar*, int );

 #endif
 
 
 #endif
 
 

diff --git a/src/common/object.cpp b/src/common/object.cpp
index a9b7d22d613a00b11491d4267646166e7a7c1d09..c091b0c6815590a06c025d6945ee6fd234185f79 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -77,11 +77,16 @@ void wxObject::Dump(wxSTD ostream& str)
 #endif
 
 
 #endif
 
 

+#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING && defined( new )
+       #undef new
+#endif
+
+

 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT
 
 #ifdef _WX_WANT_NEW_SIZET_WXCHAR_INT

-void *wxObject::operator new ( size_t size, wxChar *fileName, int lineNum )
+void *wxObject::operator new ( size_t size, const wxChar *fileName, int lineNum )

 {
 {

-    return wxDebugAlloc(size, fileName, lineNum, TRUE);
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE);

 }
 #endif
 
 }
 #endif
 


@@ -100,16 +105,16 @@ void wxObject::operator delete ( void *buf, const char *_fname, size_t _line )
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT
 #endif
 
 #ifdef _WX_WANT_DELETE_VOID_WXCHAR_INT

-void wxObject::operator delete ( void *buf, wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) )
+void wxObject::operator delete ( void *buf, const wxChar *WXUNUSED(fileName), int WXUNUSED(lineNum) )

 {
      wxDebugFree(buf);
 }
 #endif
 
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT
 {
      wxDebugFree(buf);
 }
 #endif
 
 #ifdef _WX_WANT_ARRAY_NEW_SIZET_WXCHAR_INT

-void *wxObject::operator new[] ( size_t size, wxChar* WXUNUSED(fileName), int WXUNUSED(lineNum) )
+void *wxObject::operator new[] ( size_t size, const wxChar* fileName, int lineNum )

 {
 {

-    return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
+    return wxDebugAlloc(size, (wxChar*) fileName, lineNum, TRUE, TRUE);

 }
 #endif
 
 }
 #endif
 


@@ -121,7 +126,7 @@ void wxObject::operator delete[] ( void *buf )
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT
 #endif
 
 #ifdef _WX_WANT_ARRAY_DELETE_VOID_WXCHAR_INT

-void wxObject::operator delete[] (void * buf, wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )
+void wxObject::operator delete[] (void * buf, const wxChar*  WXUNUSED(fileName), int WXUNUSED(lineNum) )

 {
     wxDebugFree(buf, TRUE);
 }
 {
     wxDebugFree(buf, TRUE);
 }