Fixed core dump for when there is no image list on the TreeCtrl

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

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 1d82a95ba18c797f7391817d2d062ec63e8437c7..41e4132e59d5abbfb6dbaf18f32176e79d065e48 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -733,7 +733,7 @@ void wxExpr::WriteExpr(ostream& stream)    // Write as any other subexpression
     {
       stream << "\"";
       int i;
-      const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.string);
+      const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.string);
       int len = strlen(val);
       for (i = 0; i < len; i++)
       {
@@ -749,7 +749,7 @@ void wxExpr::WriteExpr(ostream& stream)    // Write as any other subexpression
     case wxExprWord:
     {
       bool quote_it = FALSE;
-      const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word);
+      const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.word);
       int len = strlen(val);
       if ((len == 0) || (len > 0 && (val[0] > 64 && val[0] < 91)))
         quote_it = TRUE;
@@ -1195,15 +1195,15 @@ char *wxmake_string(char *str)
 {
   wxChar *s, *t;
   int len, i;
-  const wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str);
+  const wxMB2WXbuf sbuf = wxConvLibc.cMB2WX(str);
 
-  str++;                       /* skip leading quote */
+//  str++;                     /* skip leading quote */
   len = wxStrlen(sbuf) - 1;    /* ignore trailing quote */
     
   s = new wxChar[len + 1];
     
   t = s;
-  for(i=0; i<len; i++)
+  for(i=1; i<len; i++) // 1 since we want to skip leading quote
   {
     if (sbuf[i] == _T('\\') && sbuf[i+1] == _T('"'))
     {