added check for iconv() version; fixed strconv.cpp to compile with both prototypes

[wxWidgets.git] / src / common / memory.cpp

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 5b93f2b37c0e489e1b2d1414d26ca9c69d8504ed..afac3b1f746e62e936bd50122eedb0aa2e4e37af 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -783,7 +783,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       {
         wxObject *obj = (wxObject *)st->GetActualData();
         if (obj->GetClassInfo()->GetClassName())
-          className = obj->GetClassInfo()->GetClassName();
+          className = (wxChar*)obj->GetClassInfo()->GetClassName();
       }
       wxDebugStatsStruct *stats = FindStatsStruct(list, className);
       if (!stats)