added wxDEPRECATED_BUT_USED_INTERNALLY_INLINE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 51c395bb7ad115896aae067435b1129868a4d0d8..1fdea422028c80759ce735c981d8fe84257ff973 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -530,6 +530,17 @@ typedef short int WXTYPE;
 #   define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x)
 #endif
 
 #   define wxDEPRECATED_BUT_USED_INTERNALLY(x) wxDEPRECATED(x)
 #endif
 

+/*
+    Combination of the two variants above: should be used for deprecated
+    functions which are defined inline and are used by wxWidgets itself.
+ */
+#ifdef WXBUILDING
+#   define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) func { body }
+#else
+#   define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body) \
+        wxDEPRECATED(func) { body }
+#endif
+

 /*  everybody gets the assert and other debug macros */
 #include "wx/debug.h"
 
 /*  everybody gets the assert and other debug macros */
 #include "wx/debug.h"
 

diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 63e815802b404292a3c5cf2946608c197688173a..1640d7b3bd3a27892511a0377112bfa785a8a652 100644 (file)
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -1065,7 +1065,7 @@ template <typename T> wxDELETEA(T*& array);
     public:
         // OldMethod() is deprecated, use NewMethod() instead
         void NewMethod();
     public:
         // OldMethod() is deprecated, use NewMethod() instead
         void NewMethod();

-        wxDEPRECATED_INLINE( void OldMethod(), NewMethod() );
+        wxDEPRECATED_INLINE( void OldMethod(), NewMethod(); )

     };
     @endcode
 
     };
     @endcode
 


@@ -1073,6 +1073,17 @@ template <typename T> wxDELETEA(T*& array);
 */
 #define wxDEPRECATED_INLINE(func, body)
 
 */
 #define wxDEPRECATED_INLINE(func, body)
 

+/**
+    Combination of wxDEPRECATED_BUT_USED_INTERNALLY() and wxDEPRECATED_INLINE().
+
+    This macro should be used for deprecated functions called by the library
+    itself (usually for backwards compatibility reasons) and which are defined
+    inline.
+
+    @header{wx/defs.h}
+*/
+#define wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(func, body)
+

 /**
     @c wxEXPLICIT is a macro which expands to the C++ @c explicit keyword if
     the compiler supports it or nothing otherwise. Thus, it can be used even in
 /**
     @c wxEXPLICIT is a macro which expands to the C++ @c explicit keyword if
     the compiler supports it or nothing otherwise. Thus, it can be used even in