applied patch to build wxMSW with CW7 (patch 550445)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -696,7 +696,7 @@ bool wxDebugContext::Dump(void)
|
||||
|
||||
// if (TRUE)
|
||||
{
|
||||
wxChar* appName = wxT("application");
|
||||
wxChar* appName = (wxChar*) wxT("application");
|
||||
wxString appNameStr("");
|
||||
if (wxTheApp)
|
||||
{
|
||||
@@ -755,7 +755,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
|
||||
|
||||
// if (TRUE)
|
||||
{
|
||||
wxChar* appName = wxT("application");
|
||||
wxChar* appName = (wxChar*) wxT("application");
|
||||
wxString appNameStr(wxT(""));
|
||||
if (wxTheApp)
|
||||
{
|
||||
@@ -789,7 +789,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
|
||||
// if (detailed && (data != (void*)m_debugStream) && (data != (void*) m_streamBuf))
|
||||
if (detailed && (data != (void*) wxLog::GetActiveTarget()))
|
||||
{
|
||||
wxChar *className = wxT("nonobject");
|
||||
wxChar *className = (wxChar*) wxT("nonobject");
|
||||
if (st->m_isObject && st->GetActualData())
|
||||
{
|
||||
wxObject *obj = (wxObject *)st->GetActualData();
|
||||
@@ -855,7 +855,7 @@ bool wxDebugContext::PrintClasses(void)
|
||||
|
||||
// if (TRUE)
|
||||
{
|
||||
wxChar* appName = wxT("application");
|
||||
wxChar* appName = (wxChar*) wxT("application");
|
||||
wxString appNameStr(wxT(""));
|
||||
if (wxTheApp)
|
||||
{
|
||||
|
Reference in New Issue
Block a user