X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a3bdee6a979146c426cd058e9bfe6b58135b124..e570a44b372cf56526c128eab646615fa59520fc:/contrib/include/wx/deprecated/wxexpr.h?ds=sidebyside

diff --git a/contrib/include/wx/deprecated/wxexpr.h b/contrib/include/wx/deprecated/wxexpr.h
index 623314a8bc..1bba40eec9 100644
--- a/contrib/include/wx/deprecated/wxexpr.h
+++ b/contrib/include/wx/deprecated/wxexpr.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c)
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_WXEXPRH__
 #define _WX_WXEXPRH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "wxexpr.h"
-#endif
-
 #include "wx/deprecated/setup.h"
 
 #if wxUSE_PROLOGIO
@@ -48,11 +44,11 @@
 #define WXEXPR_ERROR_GENERAL 1
 #define WXEXPR_ERROR_SYNTAX  2
 
-// Error handler function definition. If app returns TRUE,
+// Error handler function definition. If app returns true,
 // carry on processing.
 typedef bool (*wxExprErrorHandler) (int errorType, char *msg);
 
-WXDLLEXPORT_DATA(extern wxExprErrorHandler) currentwxExprErrorHandler;
+WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprErrorHandler) currentwxExprErrorHandler;
 
 
 typedef enum {
@@ -64,9 +60,9 @@ typedef enum {
     wxExprList
 } wxExprType;
 
-class WXDLLEXPORT wxExprDatabase;
+class WXDLLIMPEXP_DEPRECATED wxExprDatabase;
 
-class WXDLLEXPORT wxExpr
+class WXDLLIMPEXP_DEPRECATED wxExpr
 {
  public:
   wxObject *client_data;
@@ -196,7 +192,7 @@ class WXDLLEXPORT wxExpr
     DECLARE_NO_COPY_CLASS(wxExpr)
 };
 
-class WXDLLEXPORT wxExprDatabase: public wxList
+class WXDLLIMPEXP_DEPRECATED wxExprDatabase: public wxList
 {
 private:
     wxNode *position;              // Where we are in a search
@@ -262,7 +258,7 @@ private:
 // Function call-style interface - some more convenience wrappers/unwrappers
 
 // Make a call
-WXDLLEXPORT wxExpr* wxExprMakeCall(const wxString& functor ...);
+WXDLLIMPEXP_DEPRECATED wxExpr* wxExprMakeCall(const wxString& functor ...);
 
 #define wxExprMakeInteger(x) (new wxExpr((long)x))
 #define wxExprMakeReal(x) (new wxExpr((double)x))
@@ -271,13 +267,13 @@ WXDLLEXPORT wxExpr* wxExprMakeCall(const wxString& functor ...);
 #define wxExprMake(x)       (new wxExpr(x))
 
 // Checks functor
-WXDLLEXPORT bool wxExprIsFunctor(wxExpr *expr, const wxString& functor);
+WXDLLIMPEXP_DEPRECATED bool wxExprIsFunctor(wxExpr *expr, const wxString& functor);
 
 // Temporary variable for communicating between wxexpr.cpp and YACC/LEX
-WXDLLEXPORT_DATA(extern wxExprDatabase*) thewxExprDatabase;
+WXDLLIMPEXP_DATA_DEPRECATED(extern wxExprDatabase*) thewxExprDatabase;
 
 // YACC/LEX can leave memory lying around...
-extern "C" WXDLLEXPORT int wxExprCleanUp();
+extern "C" WXDLLIMPEXP_DEPRECATED int wxExprCleanUp();
 
 #endif // wxUSE_PROLOGIO