Source and warning cleaning after enabling wxUSE_DATAVIEWCTRL in wxMSW builds.

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

diff --git a/include/wx/debug.h b/include/wx/debug.h
index f0cb8a5d5eae59ec1db0e0a7e59d518941c0ec8b..06f302d8206a1758bb30619ee8513bf09cca14de 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -47,15 +47,23 @@
     #endif /*  !WXDEBUG */
 #endif /*  __WXDEBUG__ */
 
-/* TODO: add more compilers supporting __FUNCTION__ */
-#if 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
+#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 */