wxITEM_FOO instead of wxItem_Foo, for the sake of consistency

[wxWidgets.git] / include / wx / wxexpr.h

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index adaaa4c7f5a5c3b5cbf888ec4d3fdeb0c2e70cc0..acad013bcfe1b8694628c6442ff8e06d9d7e40da 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -50,9 +50,6 @@ typedef bool (*wxExprErrorHandler) (int errorType, char *msg);
 
 WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler;
 
 
 WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler;
 

-extern "C" WXDLLEXPORT_DATA(FILE*) yyin;
-
-extern "C" WXDLLEXPORT int yyparse(void);

 
 typedef enum {
     wxExprNull,
 
 typedef enum {
     wxExprNull,


@@ -112,7 +109,7 @@ class WXDLLEXPORT wxExpr
       return value.word;
     else if (type == wxExprString)
       return wxString(value.string);
       return value.word;
     else if (type == wxExprString)
       return wxString(value.string);

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

   }
 
   inline wxString StringValue(void) const {
   }
 
   inline wxString StringValue(void) const {


@@ -120,7 +117,7 @@ class WXDLLEXPORT wxExpr
       return wxString(value.string);
     else if (type == wxExprWord)
       return wxString(value.word);
       return wxString(value.string);
     else if (type == wxExprWord)
       return wxString(value.word);

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

   }
 
   // Get nth arg of clause (starting from 1)
   }
 
   // Get nth arg of clause (starting from 1)