same as r57054 in 2.8

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

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index e304fd3fc23470089eb279fe4f25a53b73bef528..2a73a29f77b69c502437a73744e84183199929ac 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -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() ;
 }


@@ -429,7 +429,7 @@ struct wxRuntimeDepersister::wxRuntimeDepersisterInternal
             return NULL ;
         if ( m_objects.find(objectID) == m_objects.end() )
         {
             return NULL ;
         if ( m_objects.find(objectID) == m_objects.end() )
         {

-            wxLogError( _("Passing an unkown object to GetObject") ) ;
+            wxLogError( _("Passing an unknown object to GetObject") ) ;

             return NULL ;
         }
 
             return NULL ;
         }