wxLoadCharacterSets() now appears to work (was a bit slow, but since it's

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

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 0b5a9caa49ef10c4b0b5057dcbcde31a2edbea53..1d82a95ba18c797f7391817d2d062ec63e8437c7 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;
-      wxWX2MBbuf val = wxConv_libc.cWX2MB(value.string);
+      const wxWX2MBbuf val = wxConv_libc.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;
-      wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word);
+      const wxWX2MBbuf val = wxConv_libc.cWX2MB(value.word);
       int len = strlen(val);
       if ((len == 0) || (len > 0 && (val[0] > 64 && val[0] < 91)))
         quote_it = TRUE;
@@ -1070,7 +1070,7 @@ bool wxExprDatabase::ReadFromString(const wxString& buffer)
   noErrors = 0;
   thewxExprDatabase = this;
 
-  wxWX2MBbuf buf = buffer.mb_str();
+  const wxWX2MBbuf buf = buffer.mb_str();
   LexFromString(MBSTRINGCAST buf);
   yyparse();
   wxExprCleanUp();
@@ -1195,7 +1195,7 @@ char *wxmake_string(char *str)
 {
   wxChar *s, *t;
   int len, i;
-  wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str);
+  const wxMB2WXbuf sbuf = wxConv_libc.cMB2WX(str);
 
   str++;                       /* skip leading quote */
   len = wxStrlen(sbuf) - 1;    /* ignore trailing quote */