X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af498247c5ea024a781d0ef8d30cbbfb44749641..b53aea81d2e102224b452ef5bf7aee1132f37c6f:/src/common/xtistrm.cpp diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp index 6438ed2815..2a73a29f77 100644 --- a/src/common/xtistrm.cpp +++ b/src/common/xtistrm.cpp @@ -9,29 +9,25 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "xtistrm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_EXTENDED_RTTI + +#include "wx/xtistrm.h" + #ifndef WX_PRECOMP -#include "wx/hash.h" -#include "wx/object.h" + #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" - -#if wxUSE_EXTENDED_RTTI - -#include "wx/xtistrm.h" #include "wx/beforestd.h" #include @@ -288,7 +284,7 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() ) return ; } - + // avoid streaming out null objects const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ; @@ -393,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() ; } @@ -433,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 ; } @@ -582,7 +578,7 @@ void wxRuntimeDepersister::SetConnect(int eventSourceObjectID, handlerInfo->GetEventFunction() , NULL /*user data*/ , ehsink ) ; } - } + } } } @@ -844,8 +840,8 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID, } } -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxxVariantArray); -#endif +#endif // wxUSE_EXTENDED_RTTI