*/
void wxMemStruct::ErrorMsg (const char * mesg)
{
- wxLogDebug("wxWindows memory checking error: %s", mesg);
+ wxLogDebug(wxT("wxWindows memory checking error: %s"), mesg);
PrintNode ();
// << m_fileName << ' ' << m_lineNum << endl;
*/
void wxMemStruct::ErrorMsg ()
{
- wxLogDebug("wxWindows over/underwrite memory error:");
+ wxLogDebug(wxT("wxWindows over/underwrite memory error:"));
PrintNode ();
// cerr << m_fileName << ' ' << m_lineNum << endl;
// Let's put this in standard form so IDEs can load the file at the appropriate
// line
- wxString msg("");
+ wxString msg(wxT(""));
if (m_fileName)
- msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
if (info && info->GetClassName())
msg += info->GetClassName();
else
- msg += "object";
+ msg += wxT("object");
wxString msg2;
- msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
wxLogDebug(msg);
wxString msg("");
if (m_fileName)
- msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
- msg += ("non-object data");
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
+ msg += wxT("non-object data");
wxString msg2;
- msg2.Printf(" at $%lX, size %d\n", (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at $%lX, size %d\n"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
wxLogDebug(msg);
{
wxObject *obj = (wxObject *)m_actualData;
- wxString msg("");
+ wxString msg(wxT(""));
if (m_fileName)
- msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
/* TODO: We no longer have a stream (using wxLogDebug) so we can't dump it.
if (obj->GetClassInfo() && obj->GetClassInfo()->GetClassName())
msg += obj->GetClassInfo()->GetClassName();
else
- msg += "unknown object class";
+ msg += wxT("unknown object class");
wxString msg2("");
- msg2.Printf(" at $%lX, size %d", (long)GetActualData(), (int)RequestSize());
+ msg2.Printf(wxT(" at $%lX, size %d"), (long)GetActualData(), (int)RequestSize());
msg += msg2;
wxLogDebug(msg);
}
else
{
- wxString msg("");
+ wxString msg(wxT(""));
if (m_fileName)
- msg.Printf("%s(%d): ", m_fileName, (int)m_lineNum);
+ msg.Printf(wxT("%s(%d): "), m_fileName, (int)m_lineNum);
wxString msg2("");
- msg2.Printf("non-object data at $%lX, size %d", (long)GetActualData(), (int)RequestSize() );
+ msg2.Printf(wxT("non-object data at $%lX, size %d"), (long)GetActualData(), (int)RequestSize() );
msg += msg2;
wxLogDebug(msg);
}
else {
// Can't use the error routines as we have no recognisable object.
#ifndef __WXGTK__
- wxLogDebug("Can't verify memory struct - all bets are off!");
+ wxLogDebug(wxT("Can't verify memory struct - all bets are off!"));
#endif
}
return 0;
bool wxDebugContext::SetFile(const wxString& file)
{
- ofstream *str = new ofstream((char *) (const char *)file);
+ ofstream *str = new ofstream(file.fn_str());
if (str->bad())
{
// if (!HasStream())
// return FALSE;
- if (TRUE)
+// if (TRUE)
{
- char* appName = "application";
+ wxChar* appName = wxT("application");
wxString appNameStr("");
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxLogDebug("----- Memory dump of %s at %s -----", appName, WXSTRINGCAST wxNow() );
+ appName = WXSTRINGCAST appNameStr;
+ wxLogDebug(wxT("----- Memory dump of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogDebug( "----- Memory dump -----" );
+ wxLogDebug( wxT("----- Memory dump -----") );
}
}
TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
- wxLogDebug( "" );
- wxLogDebug( "" );
+ wxLogDebug( wxT("") );
+ wxLogDebug( wxT("") );
return TRUE;
#else
{
long instanceCount;
long totalSize;
- char *instanceClass;
+ wxChar *instanceClass;
wxDebugStatsStruct *next;
};
-static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, char *name)
+static wxDebugStatsStruct *FindStatsStruct(wxDebugStatsStruct *st, wxChar *name)
{
while (st)
{
- if (strcmp(st->instanceClass, name) == 0)
+ if (wxStrcmp(st->instanceClass, name) == 0)
return st;
st = st->next;
}
// if (!HasStream())
// return FALSE;
- if (TRUE)
+// if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ wxChar* appName = wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxLogDebug("----- Memory statistics of %s at %s -----", appName, WXSTRINGCAST wxNow() );
+ appName = WXSTRINGCAST appNameStr;
+ wxLogDebug(wxT("----- Memory statistics of %s at %s -----"), appName, WXSTRINGCAST wxNow() );
}
else
{
- wxLogDebug( "----- Memory statistics -----" );
+ wxLogDebug( wxT("----- Memory statistics -----") );
}
}
// if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
if (detailed && (data != (void*) wxLog::GetActiveTarget()))
{
- char *className = "nonobject";
+ wxChar *className = wxT("nonobject");
if (st->m_isObject && st->GetActualData())
{
wxObject *obj = (wxObject *)st->GetActualData();
{
while (list)
{
- wxLogDebug("%ld objects of class %s, total size %ld",
+ wxLogDebug(wxT("%ld objects of class %s, total size %ld"),
list->instanceCount, list->instanceClass, list->totalSize);
wxDebugStatsStruct *old = list;
list = old->next;
free((char *)old);
}
- wxLogDebug("");
+ wxLogDebug(wxT(""));
}
SetDebugMode(currentMode);
- wxLogDebug("Number of object items: %ld", noObjectNodes);
- wxLogDebug("Number of non-object items: %ld", noNonObjectNodes);
- wxLogDebug("Total allocated size: %ld", totalSize);
- wxLogDebug("");
- wxLogDebug("");
+ wxLogDebug(wxT("Number of object items: %ld"), noObjectNodes);
+ wxLogDebug(wxT("Number of non-object items: %ld"), noNonObjectNodes);
+ wxLogDebug(wxT("Total allocated size: %ld"), totalSize);
+ wxLogDebug(wxT(""));
+ wxLogDebug(wxT(""));
return TRUE;
#else
// if (!HasStream())
// return FALSE;
- if (TRUE)
+// if (TRUE)
{
- char* appName = "application";
- wxString appNameStr("");
+ wxChar* appName = wxT("application");
+ wxString appNameStr(wxT(""));
if (wxTheApp)
{
appNameStr = wxTheApp->GetAppName();
- appName = (char*) (const char*) appNameStr;
- wxLogDebug("----- Classes in %s -----", appName);
+ appName = WXSTRINGCAST appNameStr;
+ wxLogDebug(wxT("----- Classes in %s -----"), appName);
}
}
if (info->GetClassName())
{
wxString msg(info->GetClassName());
- msg += " ";
+ msg += wxT(" ");
if (info->GetBaseClassName1() && !info->GetBaseClassName2())
{
- msg += "is a ";
+ msg += wxT("is a ");
msg += info->GetBaseClassName1();
}
else if (info->GetBaseClassName1() && info->GetBaseClassName2())
{
- msg += "is a ";
+ msg += wxT("is a ");
msg += info->GetBaseClassName1() ;
- msg += ", ";
+ msg += wxT(", ");
msg += info->GetBaseClassName2() ;
}
if (info->GetConstructor())
- msg += ": dynamic";
+ msg += wxT(": dynamic");
wxLogDebug(msg);
}
node = wxClassInfo::sm_classTable->Next();
n ++;
}
- wxLogDebug("");
- wxLogDebug("There are %d classes derived from wxObject.", n);
- wxLogDebug("");
- wxLogDebug("");
+ wxLogDebug(wxT(""));
+ wxLogDebug(wxT("There are %d classes derived from wxObject."), n);
+ wxLogDebug(wxT(""));
+ wxLogDebug(wxT(""));
return TRUE;
}
// code. I have no idea why. In BC++ 4.5, we have a similar problem the debug
// stream myseriously changing pointer address between being passed from SetFile to SetStream.
// See docs/msw/issues.txt.
-void * operator new (size_t size, char * fileName, int lineNum)
+void * operator new (size_t size, wxChar * fileName, int lineNum)
{
#ifdef NO_DEBUG_ALLOCATION
return malloc(size);
#endif
#if wxUSE_ARRAY_MEMORY_OPERATORS
-void * operator new[] (size_t size, char * fileName, int lineNum)
+void * operator new[] (size_t size, wxChar * fileName, int lineNum)
{
#ifdef NO_DEBUG_ALLOCATION
return malloc(size);
// VC++ 6.0
#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
+void operator delete(void* pData, wxChar* /* fileName */, int /* lineNum */)
{
// ::operator delete(pData);
// JACS 21/11/1998: surely we need to call wxDebugFree?
#endif
// TODO: store whether this is a vector or not.
-void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
+void * wxDebugAlloc(size_t size, wxChar * fileName, int lineNum, bool isObject, bool WXUNUSED(isVect) )
{
// If not in debugging allocation mode, do the normal thing
// so we don't leave any trace of ourselves in the node list.
int totSize = wxDebugContext::TotSize (size);
char * buf = (char *) malloc(totSize);
if (!buf) {
- wxLogDebug("Call to malloc (%ld) failed.", (long)size);
+ wxLogDebug(wxT("Call to malloc (%ld) failed."), (long)size);
return 0;
}
wxMemStruct * st = (wxMemStruct *)buf;
}
// Trace: send output to the current debugging stream
-void wxTrace(const char *fmt ...)
+void wxTrace(const wxChar *fmt ...)
{
va_list ap;
- static char buffer[512];
+ static wxChar buffer[512];
va_start(ap, fmt);
}
else
#ifdef __WXMSW__
- OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+ OutputDebugString((LPCTSTR)buffer) ;
+#else
+ OutputDebugString((const char*) buffer) ;
+#endif
#else
fprintf(stderr, buffer);
#endif
}
// Trace with level
-void wxTraceLevel(int level, const char *fmt ...)
+void wxTraceLevel(int level, const wxChar *fmt ...)
{
if (wxDebugContext::GetLevel() < level)
return;
va_list ap;
- static char buffer[512];
+ static wxChar buffer[512];
va_start(ap, fmt);
}
else
#ifdef __WXMSW__
- OutputDebugString((LPCSTR)buffer) ;
+#ifdef __WIN32__
+ OutputDebugString((LPCTSTR)buffer) ;
+#else
+ OutputDebugString((const char*) buffer) ;
+#endif
#else
fprintf(stderr, buffer);
#endif
projects / wxWidgets.git / blobdiff