Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/typeinfo.h b/include/wx/typeinfo.h
index 9d6ceb437dabbc663992da495bf9e03f9c886d0f..a783af5d56a96f4ce7a29363a0b4bcf5e0eb34c9 100644 (file)
--- a/include/wx/typeinfo.h
+++ b/include/wx/typeinfo.h
@@ -3,7 +3,6 @@
 // Purpose:     wxTypeId implementation
 // Author:      Jaakko Salli
 // Created:     2009-11-19
-// RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets Team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -27,6 +26,17 @@
 
 #ifndef wxNO_RTTI
 
+//
+// Let's trust that Visual C++ versions 9.0 and later implement C++
+// RTTI well enough, so we can use it and work around harmless memory
+// leaks reported by the static run-time libraries.
+//
+#if wxCHECK_VISUALC_VERSION(9)
+    #define wxTRUST_CPP_RTTI    1
+#else
+    #define wxTRUST_CPP_RTTI    0
+#endif
+
 #include <typeinfo>
 #include <string.h>
 
@@ -36,6 +46,12 @@
 #define WX_DEFINE_TYPEINFO(CLS)
 #define WX_DECLARE_ABSTRACT_TYPEINFO(CLS)
 
+#if wxTRUST_CPP_RTTI
+
+#define wxTypeId    typeid
+
+#else /*  !wxTRUST_CPP_RTTI */
+
 //
 // For improved type-safety, let's make the check using class name
 // comparison. Most modern compilers already do this, but we cannot
@@ -67,8 +83,12 @@ private:
 
 #define wxTypeId(OBJ) wxTypeIdentifier(typeid(OBJ).name())
 
+#endif /*  wxTRUST_CPP_RTTI/!wxTRUST_CPP_RTTI */
+
 #else // if !wxNO_RTTI
 
+#define wxTRUST_CPP_RTTI    0
+
 //
 // When C++ RTTI is not available, we will have to make the type comparison
 // using pointer to a dummy static member function. This will fail if