Slightly more efficient wxDataViewCtrl::StartEditor().

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

diff --git a/include/wx/cpp.h b/include/wx/cpp.h
index 82931e6dd7c6f5fd6f47ba0990245e01ea58a1be..eb012f530883f094dbe6f1702bfe9d00d66447b0 100644 (file)
--- a/include/wx/cpp.h
+++ b/include/wx/cpp.h
@@ -28,6 +28,16 @@
 /* a Unicode-friendly version of wxSTRINGIZE_T */
 #define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
 
 /* a Unicode-friendly version of wxSTRINGIZE_T */
 #define wxSTRINGIZE_T(x)            wxAPPLY_T(wxSTRINGIZE(x))
 

+/*
+    Special workarounds for compilers with broken "##" operator. For all the
+    other ones we can just use it directly.
+ */
+#ifdef wxCOMPILER_BROKEN_CONCAT_OPER
+    #define wxPREPEND_L(x)      L ## x
+    #define wxAPPEND_i64(x)     x ## i64
+    #define wxAPPEND_ui64(x)    x ## ui64
+#endif /* wxCOMPILER_BROKEN_CONCAT_OPER */
+

 /*
    Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the
    current line number to the given identifier to reduce the probability of the
 /*
    Helper macros for wxMAKE_UNIQUE_NAME: normally this works by appending the
    current line number to the given identifier to reduce the probability of the


@@ -57,5 +67,27 @@
  */
 #define wxEMPTY_PARAMETER_VALUE /* Fake macro parameter value */
 
  */
 #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_ */
 
 #endif /* _WX_CPP_H_ */