X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd15d8f1b0b437312a117b7e4509708a22e30806..8366ae934aab9f835747b0c2e456231e8795fe78:/include/wx/wxexpr.h?ds=sidebyside diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h index 30d32fda62..acad013bcf 100644 --- 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; -extern "C" WXDLLEXPORT_DATA(FILE*) yyin; - -extern "C" WXDLLEXPORT int yyparse(void); typedef enum { wxExprNull, @@ -112,7 +109,7 @@ class WXDLLEXPORT wxExpr return value.word; else if (type == wxExprString) return wxString(value.string); - else return wxString(_T("")); + else return wxString(wxT("")); } inline wxString StringValue(void) const { @@ -120,7 +117,7 @@ class WXDLLEXPORT wxExpr 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) @@ -141,7 +138,6 @@ class WXDLLEXPORT wxExpr bool IsFunctor(const wxString& s) const; // Only for a clause void WriteClause(FILE* stream); // Write this expression as a top-level clause void WriteExpr(FILE* stream); // Write as any other subexpression - void WriteLispExpr(FILE* stream); // Append an expression to a list void Append(wxExpr *expr); @@ -243,7 +239,6 @@ public: bool ReadFromString(const wxString& buffer); bool Write(const wxString& fileName); bool Write(FILE* stream); - void WriteLisp(FILE* stream); // Compatibility inline bool ReadProlog(wxChar *filename) { return Read(wxString(filename)); }