move __WXFUNCTION__ to wx/cpp.h from wx/debug.h

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

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index 82931e6dd7c6f5fd6f47ba0990245e01ea58a1be..e1267b03252d4858847b4ece9ea628bc4d5612f8 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -57,5 +57,27 @@
  */
 #define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
 
+/*
+    Define __WXFUNCTION__ which is like standard __FUNCTION__ but defined as
+    NULL for the compilers which don't support the latter.
+ */
+#ifndef __WXFUNCTION__
+    /* TODO: add more compilers supporting __FUNCTION__ */
+    #if defined(__DMC__)
+        /*
+           __FUNCTION__ happens to be not defined within class members
+           http://www.digitalmars.com/drn-bin/wwwnews?c%2B%2B.beta/485
+        */
+        #define __WXFUNCTION__ (NULL)
+    #elif defined(__GNUC__) || \
+          (defined(_MSC_VER) && _MSC_VER >= 1300) || \
+          defined(__FUNCTION__)
+        #define __WXFUNCTION__ __FUNCTION__
+    #else
+        /* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */
+        #define __WXFUNCTION__ (NULL)
+    #endif
+#endif /* __WXFUNCTION__ already defined */
+
 #endif /* _WX_CPP_H_ */
 

diff --git a/include/wx/debug.h b/include/wx/debug.h
index a817676b616703883a0963600daf511f91067279..9dc2e1b3fdcf1c4b124f4cf279fad906f2539478 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -18,6 +18,7 @@
 #include <limits.h>          // for CHAR_BIT used below
 
 #include "wx/chartype.h"     // for __TFILE__ and wxChar
+#include "wx/cpp.h"          // for __WXFUNCTION__
 
 // ----------------------------------------------------------------------------
 // Defines controlling the debugging macros
@@ -45,24 +46,6 @@
     #endif // !WXDEBUG
 #endif // __WXDEBUG__
 
-#ifndef __WXFUNCTION__
-    /* TODO: add more compilers supporting __FUNCTION__ */
-    #if defined(__DMC__)
-        /*
-           __FUNCTION__ happens to be not defined within class members
-           http://www.digitalmars.com/drn-bin/wwwnews?c%2B%2B.beta/485
-        */
-        #define __WXFUNCTION__ (NULL)
-    #elif defined(__GNUC__) || \
-          (defined(_MSC_VER) && _MSC_VER >= 1300) || \
-          defined(__FUNCTION__)
-        #define __WXFUNCTION__ __FUNCTION__
-    #else
-        /* still define __WXFUNCTION__ to avoid #ifdefs elsewhere */
-        #define __WXFUNCTION__ (NULL)
-    #endif
-#endif /* __WXFUNCTION__ already defined */
-
 // ----------------------------------------------------------------------------
 // Debugging macros
 //

diff --git a/interface/wx/cpp.h b/interface/wx/cpp.h
index 16a919d4bcc8590ac16eda8ecac06c840f061664..094d408695f3a540a45cfb4ed833831477457fc2 100644 (file)
--- a/interface/wx/cpp.h
+++ b/interface/wx/cpp.h
@@ -48,5 +48,14 @@
 */
 #define wxSTRINGIZE_T(x)
 
+/**
+    This macro expands to the name of the current function if the compiler
+    supports any of @c __FUNCTION__, @c __func__ or equivalent variables or
+    macros or to @NULL if none of them is available.
+
+    @header{wx/cpp.h}
+*/
+#define __WXFUNCTION__
+
 //@}
 

diff --git a/interface/wx/debug.h b/interface/wx/debug.h
index 337ea6e4831f119f3526e68363aebe27429cf11b..1a6e697d97a4c4155e76f240261a8599a2a9d94b 100644 (file)
--- a/interface/wx/debug.h
+++ b/interface/wx/debug.h
@@ -241,19 +241,3 @@ void wxTrap();
 
 //@}
 
-
-
-/** @addtogroup group_funcmacro_misc */
-//@{
-
-/**
-    This macro expands to the name of the current function if the compiler
-    supports any of @c __FUNCTION__, @c __func__ or equivalent variables or
-    macros or to @NULL if none of them is available.
-
-    @header{wx/debug.h}
-*/
-#define __WXFUNCTION__
-
-//@}
-