X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e3f3880bc2b13b0ff90a60f676959989da732dd..a7aeddacf9dfcb9dca64fccb5f65f387bcff0fb2:/src/common/xtistrm.cpp diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp index fee284e6cb..6cab5826c7 100644 --- a/src/common/xtistrm.cpp +++ b/src/common/xtistrm.cpp @@ -18,16 +18,16 @@ #if wxUSE_EXTENDED_RTTI +#include "wx/xtistrm.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" -#include "wx/event.h" - -#include "wx/xtistrm.h" #include "wx/beforestd.h" #include @@ -389,7 +389,7 @@ bool wxReader::HasObjectClassInfo( int objectID ) 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() ; } @@ -429,7 +429,7 @@ struct wxRuntimeDepersister::wxRuntimeDepersisterInternal 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 ; } @@ -649,7 +649,7 @@ struct wxCodeDepersister::wxCodeDepersisterInternal if ( m_objectNames.find(objectID) == m_objectNames.end() ) { - wxLogError( _("Passing an unkown object to GetObject") ) ; + wxLogError( _("Passing an unknown object to GetObject") ) ; return wxEmptyString ; } return wxString( m_objectNames[objectID].c_str() ) ; @@ -842,6 +842,6 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID, #include "wx/arrimpl.cpp" -WX_DEFINE_OBJARRAY(wxxVariantArray); +WX_DEFINE_OBJARRAY(wxxVariantArray) #endif // wxUSE_EXTENDED_RTTI