X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a3bdee6a979146c426cd058e9bfe6b58135b124..7f5d8b0085b0140f62fb49dd8a0e50ed895e4632:/contrib/include/wx/deprecated/wxexpr.h

diff --git a/contrib/include/wx/deprecated/wxexpr.h b/contrib/include/wx/deprecated/wxexpr.h
index 623314a8bc..e9837f04cf 100644
--- a/contrib/include/wx/deprecated/wxexpr.h
+++ b/contrib/include/wx/deprecated/wxexpr.h
@@ -52,7 +52,7 @@
 // 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 +64,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 +196,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 +262,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 +271,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