X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5fa399c9e241e99132733b09673cbcb76c9f77e1..d1f9b2061171dcf095398af34de10dc4ff26dfb6:/src/common/memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 9730edb82d..902a88a2f2 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -519,7 +519,7 @@ void wxDebugContext::SetStream(ostream *str, streambuf *buf)
 
 bool wxDebugContext::SetFile(const wxString& file)
 {
-  ofstream *str = new ofstream(file.fn_str());
+  ofstream *str = new ofstream(file.mb_str());
 
   if (str->bad())
   {
@@ -1026,7 +1026,7 @@ void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
   wxDebugFree(pData, FALSE);
 }
 // New operator 21/11/1998
-void operator delete[](void* pData, char* /* fileName */, int /* lineNum */)
+void operator delete[](void* pData, wxChar* /* fileName */, int /* lineNum */)
 {
   wxDebugFree(pData, TRUE);
 }
@@ -1146,7 +1146,10 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 // Trace: send output to the current debugging stream
 void wxTrace(const wxChar *fmt ...)
 {
-  va_list ap;
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
+    va_list ap;
   static wxChar buffer[512];
 
   va_start(ap, fmt);
@@ -1174,11 +1177,15 @@ void wxTrace(const wxChar *fmt ...)
 #else
     fprintf(stderr, buffer);
 #endif
+#endif
 }
 
 // Trace with level
 void wxTraceLevel(int level, const wxChar *fmt ...)
 {
+#if 1
+    wxFAIL_MSG(wxT("wxTrace is now obsolete. Please use wxDebugXXX instead."));
+#else
   if (wxDebugContext::GetLevel() < level)
     return;
 
@@ -1188,7 +1195,7 @@ void wxTraceLevel(int level, const wxChar *fmt ...)
   va_start(ap, fmt);
 
 #ifdef __WXMSW__
-  wvsprintf(buffer,fmt,ap) ;
+  wxWvsprintf(buffer,fmt,ap) ;
 #else
   vsprintf(buffer,fmt,ap) ;
 #endif
@@ -1210,6 +1217,7 @@ void wxTraceLevel(int level, const wxChar *fmt ...)
 #else
     fprintf(stderr, buffer);
 #endif
+#endif
 }
 
 #else // wxUSE_MEMORY_TRACING && defined(__WXDEBUG__)