X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cab1a6053dce9f0a2dcd87d8e2d12d8633f4785f..472137baebae6c011ad7d70285de454b9ce7796d:/src/common/xtistrm.cpp diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp index 03d974f25e..20d21f6f5b 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 @@ -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() ; } @@ -844,8 +840,8 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID, } } -#include +#include "wx/arrimpl.cpp" WX_DEFINE_OBJARRAY(wxxVariantArray); -#endif +#endif // wxUSE_EXTENDED_RTTI