small fix for mingw32 compilation

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

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 926cae30013f5f40888956fab62d06c1343a340a..08f4affcd73779f3dc011214bbfc4e1974ee2d65 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,13 +20,11 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include <fstream.h>

 #include <stdarg.h>
 #include <ctype.h>
 #include <string.h>
 
 #include "wx/utils.h"
 #include <stdarg.h>
 #include <ctype.h>
 #include <string.h>
 
 #include "wx/utils.h"

-

 #include "wx/expr.h"
 #include "wx/wxexpr.h"
 
 #include "wx/expr.h"
 #include "wx/wxexpr.h"
 


@@ -34,11 +32,10 @@ extern "C" void add_expr(char *);
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 
 extern "C" void LexFromFile(FILE *fd);
 extern "C" void LexFromString(char *buf);
 

+

 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 
 wxExprDatabase *thewxExprDatabase = NULL;
 wxExprErrorHandler currentwxExprErrorHandler;
 

-IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
-

 wxExpr::wxExpr(const wxString& functor)
 {
   type = wxExprList;
 wxExpr::wxExpr(const wxString& functor)
 {
   type = wxExprList;


@@ -58,10 +55,10 @@ wxExpr::wxExpr(wxExprType the_type, const wxString& word_or_string)
   switch (the_type)
   {
    case wxExprWord:
   switch (the_type)
   {
    case wxExprWord:

-    value.word = copystring((const char *)word_or_string);
+    value.word = copystring((const wxChar *)word_or_string);

     break;
    case wxExprString:
     break;
    case wxExprString:

-    value.string = copystring((const char *)word_or_string);
+    value.string = copystring((const wxChar *)word_or_string);

     break;
    case wxExprList:
     last = NULL;
     break;
    case wxExprList:
     last = NULL;


@@ -76,7 +73,7 @@ wxExpr::wxExpr(wxExprType the_type, const wxString& word_or_string)
   next = NULL;
 }
 
   next = NULL;
 }
 

-wxExpr::wxExpr(wxExprType the_type, char *word_or_string, bool allocate)
+wxExpr::wxExpr(wxExprType the_type, wxChar *word_or_string, bool allocate)

 {
   type = the_type;
 
 {
   type = the_type;
 


@@ -251,7 +248,7 @@ wxExpr *wxExpr::GetAttributeValueNode(const wxString& word) const // Use only fo
       {
         wxExpr *secondNode = firstNode->next;
         if ((secondNode->type == wxExprWord) && 
       {
         wxExpr *secondNode = firstNode->next;
         if ((secondNode->type == wxExprWord) && 

-            (strcmp((const char *)word, secondNode->value.word) == 0))
+            (wxStrcmp((const wxChar *)word, secondNode->value.word) == 0))

         {
           return expr;
         }
         {
           return expr;
         }


@@ -278,12 +275,12 @@ wxExpr *wxExpr::AttributeValue(const wxString& word) const // Use only for a cla
 wxString wxExpr::Functor(void) const // Use only for a clause
 {
   if ((type != wxExprList) || !value.first)
 wxString wxExpr::Functor(void) const // Use only for a clause
 {
   if ((type != wxExprList) || !value.first)

-    return wxString("");
+    return wxString(_T(""));

 
   if (value.first->type == wxExprWord)
     return wxString(value.first->value.word);
   else
 
   if (value.first->type == wxExprWord)
     return wxString(value.first->value.word);
   else

-    return wxString("");
+    return wxString(_T(""));

 }
 
 bool wxExpr::IsFunctor(const wxString& f) const  // Use only for a clause
 }
 
 bool wxExpr::IsFunctor(const wxString& f) const  // Use only for a clause


@@ -292,7 +289,7 @@ bool wxExpr::IsFunctor(const wxString& f) const  // Use only for a clause
     return FALSE;
 
   return (value.first->type == wxExprWord && 
     return FALSE;
 
   return (value.first->type == wxExprWord && 

-          (strcmp((const char *)f, value.first->value.word) == 0));
+          (wxStrcmp((const wxChar *)f, value.first->value.word) == 0));

 }
 
 // Return nth argument of a clause (starting from 1)
 }
 
 // Return nth argument of a clause (starting from 1)


@@ -361,7 +358,7 @@ void wxExpr::DeleteAttributeValue(const wxString& attribute)
       {
         wxExpr *secondNode = firstNode->next;
         if ((secondNode->type == wxExprWord) && 
       {
         wxExpr *secondNode = firstNode->next;
         if ((secondNode->type == wxExprWord) && 

-            (strcmp((const char *)attribute, secondNode->value.word) == 0))
+            (wxStrcmp((const wxChar *)attribute, secondNode->value.word) == 0))

         {
           wxExpr *nextExpr = expr->next;
           delete expr;
         {
           wxExpr *nextExpr = expr->next;
           delete expr;


@@ -393,7 +390,7 @@ void wxExpr::AddAttributeValue(const wxString& attribute, wxExpr *val)
 //  DeleteAttributeValue(attribute);
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
 //  DeleteAttributeValue(attribute);
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 


@@ -417,7 +414,7 @@ void wxExpr::AddAttributeValue(const wxString& attribute, long val)
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(val);
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(val);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 


@@ -439,7 +436,7 @@ void wxExpr::AddAttributeValue(const wxString& attribute, double val)
 //  DeleteAttributeValue(attribute);
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(val);
 //  DeleteAttributeValue(attribute);
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(val);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 


@@ -462,7 +459,7 @@ void wxExpr::AddAttributeValueString(const wxString& attribute, const wxString&
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(wxExprString, val);
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(wxExprString, val);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 


@@ -485,7 +482,7 @@ void wxExpr::AddAttributeValueWord(const wxString& attribute, const wxString& va
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(wxExprWord, val);
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(wxExprWord, val);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 


@@ -510,7 +507,7 @@ void wxExpr::AddAttributeValue(const wxString& attribute, wxList *val)
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(val);
 
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
   wxExpr *pval = new wxExpr(val);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr = new wxExpr(wxExprList);
 


@@ -546,7 +543,7 @@ void wxExpr::AddAttributeValueStringList(const wxString& attribute, wxList *stri
 
   // Now make an (=, Att, Value) triple
   wxExpr *patt = new wxExpr(wxExprWord, attribute);
 
   // Now make an (=, Att, Value) triple
   wxExpr *patt = new wxExpr(wxExprWord, attribute);

-  wxExpr *pequals = new wxExpr(wxExprWord, "=");
+  wxExpr *pequals = new wxExpr(wxExprWord, _T("="));

 
   wxExpr *listExpr2 = new wxExpr(wxExprList);
 
 
   wxExpr *listExpr2 = new wxExpr(wxExprList);
 


@@ -656,18 +653,18 @@ bool wxExpr::GetAttributeValueStringList(const wxString& att, wxList *var) const
 }
 
 // Compatibility
 }
 
 // Compatibility

-void wxExpr::AssignAttributeValue(char *att, char **var) const
+void wxExpr::AssignAttributeValue(wxChar *att, wxChar **var) const

 {
   wxString str;
   if (GetAttributeValue(att, str))
   {
     if (*var)
       delete[] *var;
 {
   wxString str;
   if (GetAttributeValue(att, str))
   {
     if (*var)
       delete[] *var;

-    *var = copystring((const char *) str);
+    *var = copystring((const wxChar *) str);

   }
 }
 
   }
 }
 

-void wxExpr::WriteClause(ostream& stream)  // Write this expression as a top-level clause
+void wxExpr::WriteClause(FILE* stream)  // Write this expression as a top-level clause

 {
   if (type != wxExprList)
     return;
 {
   if (type != wxExprList)
     return;


@@ -676,23 +673,24 @@ void wxExpr::WriteClause(ostream& stream)  // Write this expression as a top-lev
   if (node)
   {
     node->WriteExpr(stream);
   if (node)
   {
     node->WriteExpr(stream);

-    stream << "(";
+    fprintf( stream, "(" );

     node = node->next;
     bool first = TRUE;
     while (node)
     {
       if (!first)
     node = node->next;
     bool first = TRUE;
     while (node)
     {
       if (!first)

-        stream << "  ";
+        fprintf( stream, "  " );

       node->WriteExpr(stream);
       node = node->next;
       node->WriteExpr(stream);
       node = node->next;

-      if (node) stream << ",\n";
+      if (node) 
+        fprintf( stream, ",\n" );

       first = FALSE;
     }
       first = FALSE;
     }

-    stream << ").\n\n";
+    fprintf( stream, ").\n\n" );

   }
 }
 
   }
 }
 

-void wxExpr::WriteExpr(ostream& stream)    // Write as any other subexpression
+void wxExpr::WriteExpr(FILE* stream)    // Write as any other subexpression

 {
   // This seems to get round an optimizer bug when
   // using Watcom C++ 10a in WIN32 compilation mode.
 {
   // This seems to get round an optimizer bug when
   // using Watcom C++ 10a in WIN32 compilation mode.


@@ -709,89 +707,87 @@ void wxExpr::WriteExpr(ostream& stream)    // Write as any other subexpression
   {
     case wxExprInteger:
     {
   {
     case wxExprInteger:
     {

-      stream << value.integer;
+      fprintf( stream, "%ld", value.integer );

       break;
     }
     case wxExprReal:
     {
       double f = value.real;
       break;
     }
     case wxExprReal:
     {
       double f = value.real;

-/* Now the parser can cope with this.
-      // Prevent printing in 'e' notation. Any better way?
-      if (fabs(f) < 0.00001)
-        f = 0.0;
-*/
-      char buf[40];
-      sprintf(buf, "%.6g", f);
-      stream << buf;
+      fprintf( stream, "%.6g", f);

       break;
     }
     case wxExprString:
     {
       break;
     }
     case wxExprString:
     {

-      stream << "\"";
+      fprintf( stream, "\"" );

       int i;
       int i;

-      int len = strlen(value.string);
+      const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.string);
+      int len = strlen(val);

       for (i = 0; i < len; i++)
       {
       for (i = 0; i < len; i++)
       {

-        char ch = value.string[i];
+        char ch = val[i];

         if (ch == '"' || ch == '\\')
         if (ch == '"' || ch == '\\')

-          stream << "\\";
-        stream << ch;
+         fprintf( stream, "\\" );
+       char tmp[2];
+       tmp[0] = ch;
+       tmp[1] = 0;
+        fprintf( stream, tmp );

       }
       }

-
-      stream << "\"";
+      fprintf( stream, "\"" );

       break;
     }
     case wxExprWord:
     {
       bool quote_it = FALSE;
       break;
     }
     case wxExprWord:
     {
       bool quote_it = FALSE;

-      int len = strlen(value.word);
-      if ((len == 0) || (len > 0 && (value.word[0] > 64 && value.word[0] < 91)))
+      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;
       else
       {
         int i;
         for (i = 0; i < len; i++)
         quote_it = TRUE;
       else
       {
         int i;
         for (i = 0; i < len; i++)

-          if ((!isalpha(value.word[i])) && (!isdigit(value.word[i])) &&
-              (value.word[i] != '_'))
+          if ((!isalpha(val[i])) && (!isdigit(val[i])) &&
+              (val[i] != '_'))

             { quote_it = TRUE; i = len; }
       }
 
       if (quote_it)
             { quote_it = TRUE; i = len; }
       }
 
       if (quote_it)

-        stream << "'";
+        fprintf( stream ,"'" );

 
 

-      stream << value.word;
+      fprintf( stream, (const char*) val );

 
       if (quote_it)
 
       if (quote_it)

-        stream << "'";
+        fprintf( stream, "'" );

 
       break;
     }
     case wxExprList:
     {
       if (!value.first)
 
       break;
     }
     case wxExprList:
     {
       if (!value.first)

-        stream << "[]";
+        fprintf( stream, "[]" );

       else
       {
         wxExpr *expr = value.first;
 
       else
       {
         wxExpr *expr = value.first;
 

-        if ((expr->Type() == wxExprWord) && (strcmp(expr->WordValue(), "=") == 0))
+        if ((expr->Type() == wxExprWord) && (wxStrcmp(expr->WordValue(), _T("=")) == 0))

         {
           wxExpr *arg1 = expr->next;
           wxExpr *arg2 = arg1->next;
           arg1->WriteExpr(stream);
         {
           wxExpr *arg1 = expr->next;
           wxExpr *arg2 = arg1->next;
           arg1->WriteExpr(stream);

-          stream << " = ";
+          fprintf( stream, " = " );

           arg2->WriteExpr(stream);
         }
         else
         {
           arg2->WriteExpr(stream);
         }
         else
         {

-          stream << "[";
+          fprintf( stream, "[" );

           while (expr)
           {
             expr->WriteExpr(stream);
             expr = expr->next;
           while (expr)
           {
             expr->WriteExpr(stream);
             expr = expr->next;

-            if (expr) stream << ", ";
+            if (expr) 
+             fprintf( stream, ", " );

           }
           }

-          stream << "]";
+          fprintf( stream, "]" );

         }
       }
       break;
         }
       }
       break;


@@ -800,50 +796,14 @@ void wxExpr::WriteExpr(ostream& stream)    // Write as any other subexpression
   }
 }
 
   }
 }
 

-void wxExpr::WriteLispExpr(ostream& stream)
-{
-  switch (type)
-  {
-    case wxExprInteger:
-    {
-      stream << value.integer;
-      break;
-    }
-    case wxExprReal:
-    {
-      stream << value.real;
-      break;
-    }
-    case wxExprString:
-    {
-      stream << "\"" << value.string << "\"";
-      break;
-    }
-    case wxExprWord:
-    {
-      stream << value.word;
-      break;
-    }
-    case wxExprList:
-    {
-      wxExpr *expr = value.first;
-
-      stream << "(";
-      while (expr)
-      {
-        expr->WriteLispExpr(stream);
-        expr = expr->next;
-        if (expr) stream << " ";
-      }
-
-      stream << ")";
-      break;
-    }
-   case wxExprNull: break;
-  }
-}
+/*
+ * wxExpr 'database' (list of expressions)
+ */
+ 
+#if !USE_SHARED_LIBRARIES
+IMPLEMENT_DYNAMIC_CLASS(wxExprDatabase, wxList)
+#endif

 
 

-// wxExpr 'database' (list of expressions)

 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;
 wxExprDatabase::wxExprDatabase(wxExprErrorHandler handler)
 {
   position = NULL;


@@ -981,12 +941,12 @@ void wxExprDatabase::Append(wxExpr *clause)
     wxExpr *expr = clause->AttributeValue(attribute_to_hash);
     if (expr)
     {
     wxExpr *expr = clause->AttributeValue(attribute_to_hash);
     if (expr)
     {

-      long functor_key = hash_table->MakeKey((char *)(const char *)functor);
+      long functor_key = hash_table->MakeKey(WXSTRINGCAST functor);

       long value_key = 0;
       if (expr && expr->Type() == wxExprString)
       {
       long value_key = 0;
       if (expr && expr->Type() == wxExprString)
       {

-        value_key = hash_table->MakeKey((char *)(const char *)expr->StringValue());
-        hash_table->Put(functor_key + value_key, (char *)(const char *)expr->StringValue(), (wxObject *)clause);
+        value_key = hash_table->MakeKey(WXSTRINGCAST expr->StringValue());
+        hash_table->Put(functor_key + value_key, WXSTRINGCAST expr->StringValue(), (wxObject *)clause);

       }
       else if (expr && expr->Type() == wxExprInteger)
       {
       }
       else if (expr && expr->Type() == wxExprInteger)
       {


@@ -1000,7 +960,7 @@ void wxExprDatabase::Append(wxExpr *clause)
 
 wxExpr *wxExprDatabase::HashFind(const wxString& functor, long value) const
 {
 
 wxExpr *wxExprDatabase::HashFind(const wxString& functor, long value) const
 {

-  long key = hash_table->MakeKey((char *)(const char *)functor) + value;
+  long key = hash_table->MakeKey(WXSTRINGCAST functor) + value;

 
   // The key alone isn't guaranteed to be unique:
   // must supply value too. Let's assume the value of the
 
   // The key alone isn't guaranteed to be unique:
   // must supply value too. Let's assume the value of the


@@ -1010,8 +970,8 @@ wxExpr *wxExprDatabase::HashFind(const wxString& functor, long value) const
 
 wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value) const
 {
 
 wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value) const
 {

-  long key = hash_table->MakeKey((char *)(const char *)functor) + hash_table->MakeKey((char *)(const char *)value);
-  return (wxExpr *)hash_table->Get(key, (char *)(const char *)value);
+  long key = hash_table->MakeKey(WXSTRINGCAST functor) + hash_table->MakeKey(WXSTRINGCAST value);
+  return (wxExpr *)hash_table->Get(key, WXSTRINGCAST value);

 }
 
 void wxExprDatabase::ClearDatabase(void)
 }
 
 void wxExprDatabase::ClearDatabase(void)


@@ -1034,7 +994,7 @@ bool wxExprDatabase::Read(const wxString& filename)
 {
   noErrors = 0;
 
 {
   noErrors = 0;
 

-  FILE *f = fopen((const char *)filename, "r");
+  FILE *f = fopen(filename.fn_str(), "r");

   if (f)
   {
     thewxExprDatabase = this;
   if (f)
   {
     thewxExprDatabase = this;


@@ -1057,7 +1017,8 @@ bool wxExprDatabase::ReadFromString(const wxString& buffer)
   noErrors = 0;
   thewxExprDatabase = this;
 
   noErrors = 0;
   thewxExprDatabase = this;
 

-  LexFromString((char *)(const char *)buffer);
+  const wxWX2MBbuf buf = buffer.mb_str();
+  LexFromString(MBSTRINGCAST buf);

   yyparse();
   wxExprCleanUp();
   return (noErrors == 0);
   yyparse();
   wxExprCleanUp();
   return (noErrors == 0);


@@ -1065,13 +1026,15 @@ bool wxExprDatabase::ReadFromString(const wxString& buffer)
 
 bool wxExprDatabase::Write(const wxString& fileName)
 {
 
 bool wxExprDatabase::Write(const wxString& fileName)
 {

-  ofstream str((char *)(const char *)fileName);
-  if (str.bad())
+  FILE *stream = fopen( fileName.fn_str(), "w+" );
+  
+  if (!stream)

     return FALSE;
     return FALSE;

-  return Write(str);
+    
+  return Write(stream);

 }
 
 }
 

-bool wxExprDatabase::Write(ostream& stream)
+bool wxExprDatabase::Write(FILE *stream)

 {
   noErrors = 0;
   wxNode *node = First();
 {
   noErrors = 0;
   wxNode *node = First();


@@ -1084,19 +1047,6 @@ bool wxExprDatabase::Write(ostream& stream)
   return (noErrors == 0);
 }
 
   return (noErrors == 0);
 }
 

-void wxExprDatabase::WriteLisp(ostream& stream)
-{
-  noErrors = 0;
-  wxNode *node = First();
-  while (node)
-  {
-    wxExpr *expr = (wxExpr *)node->Data();
-    expr->WriteLispExpr(stream);
-    stream << "\n\n";
-    node = node->Next();
-  }
-}
-

 void add_expr(wxExpr * expr)
 {
   thewxExprDatabase->Append(expr);
 void add_expr(wxExpr * expr)
 {
   thewxExprDatabase->Append(expr);


@@ -1124,14 +1074,14 @@ bool wxExprIsFunctor(wxExpr *expr, const wxString& functor)
  *
  */
 
  *
  */
 

-char *make_integer(char *str)
+char *wxmake_integer(char *str)

 {
   wxExpr *x = new wxExpr(atol(str));
 
   return (char *)x;
 }
 
 {
   wxExpr *x = new wxExpr(atol(str));
 
   return (char *)x;
 }
 

-char *make_real(char *str1, char *str2)
+char *wxmake_real(char *str1, char *str2)

 {
   char buf[50];
 
 {
   char buf[50];
 


@@ -1144,7 +1094,7 @@ char *make_real(char *str1, char *str2)
 
 // extern "C" double exp10(double);
 
 
 // extern "C" double exp10(double);
 

-char *make_exp(char *str1, char *str2)
+char *wxmake_exp(char *str1, char *str2)

 {
   double mantissa = (double)atoi(str1);
   double exponent = (double)atoi(str2);
 {
   double mantissa = (double)atoi(str1);
   double exponent = (double)atoi(str2);


@@ -1156,7 +1106,7 @@ char *make_exp(char *str1, char *str2)
   return (char *)x;
 }
 
   return (char *)x;
 }
 

-char *make_exp2(char *str1, char *str2, char *str3)
+char *wxmake_exp2(char *str1, char *str2, char *str3)

 {
   char buf[50];
 
 {
   char buf[50];
 


@@ -1171,40 +1121,41 @@ char *make_exp2(char *str1, char *str2, char *str3)
   return (char *)x;
 }
 
   return (char *)x;
 }
 

-char *make_word(char *str)
+char *wxmake_word(char *str)

 {
   wxExpr *x = new wxExpr(wxExprWord, str);
   return (char *)x;
 }
 
 {
   wxExpr *x = new wxExpr(wxExprWord, str);
   return (char *)x;
 }
 

-char *make_string(char *str)
+char *wxmake_string(char *str)

 {
 {

-  char *s, *t;
+  wxChar *s, *t;

   int len, i;
   int len, i;

+  const wxMB2WXbuf sbuf = wxConvLibc.cMB2WX(str);

 
 

-  str++;                       /* skip leading quote */
-  len = strlen(str) - 1;       /* ignore trailing quote */
+//  str++;                     /* skip leading quote */
+  len = wxStrlen(sbuf) - 1;    /* ignore trailing quote */

     
     

-  s = new char[len + 1];
+  s = new wxChar[len + 1];

     
   t = s;
     
   t = s;

-  for(i=0; i<len; i++)
+  for(i=1; i<len; i++) // 1 since we want to skip leading quote

   {
   {

-    if (str[i] == '\\' && str[i+1] == '"')
+    if (sbuf[i] == _T('\\') && sbuf[i+1] == _T('"'))

     {
     {

-      *t++ = '"';
+      *t++ = _T('"');

       i ++;
     }
       i ++;
     }

-    else if (str[i] == '\\' && str[i+1] == '\\')
+    else if (sbuf[i] == _T('\\') && sbuf[i+1] == _T('\\'))

     {
     {

-      *t++ = '\\';
+      *t++ = _T('\\');

       i ++;
     }
     else
       i ++;
     }
     else

-      *t++ = str[i];
+      *t++ = sbuf[i];

   }
 
   }
 

-  *t = '\0';
+  *t = _T('\0');

 
   wxExpr *x = new wxExpr(wxExprString, s, FALSE);
   return (char *)x;
 
   wxExpr *x = new wxExpr(wxExprString, s, FALSE);
   return (char *)x;


@@ -1230,7 +1181,7 @@ void process_command(char * cexpr)
   add_expr(expr);
 }
 
   add_expr(expr);
 }
 

-void syntax_error(char *s)
+void syntax_error(char *WXUNUSED(s))

 {
   if (currentwxExprErrorHandler)
     (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, "syntax error");
 {
   if (currentwxExprErrorHandler)
     (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, "syntax error");