make wxConvUTF8 available in wchar_t-less mode, too

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

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 6f67df37a2286570e2a54615f1e34c10dce00330..b470a98ecc5f55bd555108feda41fb3fc0afe947 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_PROLOGIO
+

 #include <stdarg.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <string.h>


@@ -606,7 +608,7 @@ void wxExpr::AddAttributeValueStringList(const wxString& attribute, wxList *stri
   wxNode *node = string_list->First();
   while (node)
   {
   wxNode *node = string_list->First();
   while (node)
   {

-    char *string = (char *)node->Data();
+    wxChar *string = (wxChar*)node->GetData();

     wxExpr *expr = new wxExpr(wxExprString, wxString(string));
     listExpr->Append(expr);
     node = node->Next();
     wxExpr *expr = new wxExpr(wxExprString, wxString(string));
     listExpr->Append(expr);
     node = node->Next();


@@ -918,7 +920,7 @@ wxExpr *wxExprDatabase::FindClause(long id)  // Find a term based on an integer
     
     if (term->Type() == wxExprList)
     {
     
     if (term->Type() == wxExprList)
     {

-      wxExpr *value = term->AttributeValue("id");
+      wxExpr *value = term->AttributeValue(wxT("id"));

       if (value->Type() == wxExprInteger && value->IntegerValue() == id)
         found = term;
     }
       if (value->Type() == wxExprInteger && value->IntegerValue() == id)
         found = term;
     }


@@ -1194,7 +1196,7 @@ char *wxmake_exp2(char *str1, char *str2, char *str3)
 
 char *wxmake_word(char *str)
 {
 
 char *wxmake_word(char *str)
 {

-  wxExpr *x = new wxExpr(wxExprWord, str);
+  wxExpr *x = new wxExpr(wxExprWord, wxString(str, wxConvLibc).c_str());

   return (char *)x;
 }
 
   return (char *)x;
 }
 


@@ -1255,7 +1257,7 @@ void process_command(char * cexpr)
 void syntax_error(char *WXUNUSED(s))
 {
   if (currentwxExprErrorHandler)
 void syntax_error(char *WXUNUSED(s))
 {
   if (currentwxExprErrorHandler)

-    (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, "syntax error");
+    (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, (char *)"syntax error");

   if (thewxExprDatabase) thewxExprDatabase->noErrors += 1;
 }
 
   if (thewxExprDatabase) thewxExprDatabase->noErrors += 1;
 }
 


@@ -1272,3 +1274,5 @@ WXDLLEXPORT char *strdup(const char *s)
 #endif
 #endif
 
 #endif
 #endif
 

+#endif
+  // wxUSE_PROLOGIO