use type safe list instead of wxList for m_columns

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 45d35990403f3f68be150d2f2e14aeb2b618e266..92699a8c3a073509f513972ef766efcaa78071ac 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -776,7 +776,8 @@ void wxCSConv::LoadNow()
                 SetName(name);
         }
 
-        m_cset = wxGetCharacterSet(m_name);
+        // wxGetCharacterSet() complains about NULL name
+        m_cset = m_name ? wxGetCharacterSet(m_name) : NULL;
         m_deferred = FALSE;
     }
 }