Replaced Ok() occurrences with IsOk() throughout trunk.

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

diff --git a/include/wx/typeinfo.h b/include/wx/typeinfo.h
index becacc554750ce70142b359d9081e114e2b8560a..734783af5095242c9bacf20f6754313cf9fbaeeb 100644 (file)
--- a/include/wx/typeinfo.h
+++ b/include/wx/typeinfo.h
@@ -27,6 +27,17 @@
 
 #ifndef wxNO_RTTI
 
 
 #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>
 
 #include <typeinfo>
 #include <string.h>
 


@@ -36,6 +47,12 @@
 #define WX_DEFINE_TYPEINFO(CLS)
 #define WX_DECLARE_ABSTRACT_TYPEINFO(CLS)
 
 #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
 //
 // For improved type-safety, let's make the check using class name
 // comparison. Most modern compilers already do this, but we cannot


@@ -67,8 +84,12 @@ private:
 
 #define wxTypeId(OBJ) wxTypeIdentifier(typeid(OBJ).name())
 
 
 #define wxTypeId(OBJ) wxTypeIdentifier(typeid(OBJ).name())
 

+#endif /*  wxTRUST_CPP_RTTI/!wxTRUST_CPP_RTTI */
+

 #else // if !wxNO_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
 //
 // 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


@@ -116,7 +137,7 @@ _WX_DECLARE_TYPEINFO_CUSTOM(CLS, sm_wxClassInfo)
 
 #define wxTypeId(OBJ) (OBJ).GetWxTypeId()
 
 
 #define wxTypeId(OBJ) (OBJ).GetWxTypeId()
 

-// Because abstract classes cannot be instantiated, we use 
+// Because abstract classes cannot be instantiated, we use

 // this macro to define pure virtual type interface for them.
 #define WX_DECLARE_ABSTRACT_TYPEINFO(CLS) \
 public: \
 // this macro to define pure virtual type interface for them.
 #define WX_DECLARE_ABSTRACT_TYPEINFO(CLS) \
 public: \