Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/memory.cpp
View File

@@ -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__)