Notebook, Listbox, and Checklst updates

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

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index 30d32fda623b260344a189db05760b378c868ee4..8730ce773b54431a28db4b0f2cb71eb6a5bea3f6 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -12,7 +12,7 @@
 #ifndef _WX_WXEXPRH__
 #define _WX_WXEXPRH__
 
 #ifndef _WX_WXEXPRH__
 #define _WX_WXEXPRH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "wxexpr.h"
 #endif
 
 #pragma interface "wxexpr.h"
 #endif
 


@@ -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)


@@ -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
   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);
 
   // 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);
     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)); }
 
     // Compatibility
     inline bool ReadProlog(wxChar *filename) { return Read(wxString(filename)); }