added wxART_MISSING_IMAGE

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

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index 6450d8aba889dfddbbc77e9d2f6104551872d2d0..7df1bf9b5447aac55840fe68ce2fc475467bbb9f 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -12,11 +12,11 @@
 #ifndef _WX_WXEXPRH__
 #define _WX_WXEXPRH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "wxexpr.h"
 #endif
 
-#include <stdio.h>
+#if wxUSE_PROLOGIO
 
 #include "wx/defs.h"
 #include "wx/string.h"
@@ -26,6 +26,8 @@
 
 #include "wx/expr.h"
 
+#include <stdio.h>
+
 // Compatibility
 #define PrologExpr wxExpr
 #define PrologDatabase wxExprDatabase
@@ -50,9 +52,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 +111,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 +119,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)
@@ -191,6 +190,8 @@ class WXDLLEXPORT wxExpr
   // so we can index into the wxExpr database and fish out the pointer.
   inline void SetClientData(wxObject *data) { client_data = data; }
   inline wxObject *GetClientData(void) const { return client_data; }
+
+    DECLARE_NO_COPY_CLASS(wxExpr)
 };
 
 class WXDLLEXPORT wxExprDatabase: public wxList
@@ -250,6 +251,7 @@ public:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxExprDatabase)
+    DECLARE_NO_COPY_CLASS(wxExprDatabase)
 };
 
 // Function call-style interface - some more convenience wrappers/unwrappers
@@ -272,5 +274,7 @@ WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase;
 // YACC/LEX can leave memory lying around...
 extern "C" WXDLLEXPORT int wxExprCleanUp();
 
-#endif
+#endif // wxUSE_PROLOGIO
+
+#endif // _WX_WXEXPRH__