Removed #include <typeinfo> (since C++ RTTI is no longer used)

[wxWidgets.git] / src / common / xtistrm.cpp

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index fee284e6cbc4b1234a529a2dceac4c1bfb7d699e..20d21f6f5b366a5e5758d605ff9481ca61f7a529 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -18,16 +18,16 @@
 
 #if wxUSE_EXTENDED_RTTI
 
 
 #if wxUSE_EXTENDED_RTTI
 

+#include "wx/xtistrm.h"
+

 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/hash.h"
 #ifndef WX_PRECOMP
     #include "wx/object.h"
     #include "wx/hash.h"

+    #include "wx/event.h"

 #endif
 
 #include "wx/tokenzr.h"
 #include "wx/txtstrm.h"
 #endif
 
 #include "wx/tokenzr.h"
 #include "wx/txtstrm.h"

-#include "wx/event.h"
-
-#include "wx/xtistrm.h"

 
 #include "wx/beforestd.h"
 #include <map>
 
 #include "wx/beforestd.h"
 #include <map>


@@ -389,7 +389,7 @@ bool wxReader::HasObjectClassInfo( int objectID )
     if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
     {
         wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ;
     if ( objectID == wxNullObjectID || objectID == wxInvalidObjectID )
     {
         wxLogError( _("Invalid or Null Object ID passed to HasObjectClassInfo" ) ) ;

-        return NULL ;
+        return false ;

     }
     return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ;
 }
     }
     return m_data->m_classInfos.find(objectID) != m_data->m_classInfos.end() ;
 }