Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / cpp.h

diff --git a/interface/wx/cpp.h b/interface/wx/cpp.h
index b8585c519c1bf6f028768919648915b65ebab5ec..7b03b55fde14ab65ef6bddf465f1f6da9c86b143 100644 (file)
--- a/interface/wx/cpp.h
+++ b/interface/wx/cpp.h
@@ -3,11 +3,11 @@
 // Purpose:     interface of global functions
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
-/** @ingroup group_funcmacro_misc */
+/** @addtogroup group_funcmacro_misc */
 //@{
 /**
     This macro returns the concatenation of the arguments passed. Unlike when
@@ -22,7 +22,7 @@
 #define wxCONCAT5(x1, x2, x3, x4, x5)
 //@}
 
-/** @ingroup group_funcmacro_misc */
+/** @addtogroup group_funcmacro_misc */
 //@{
 
 /**
@@ -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__
+
 //@}