Avoid defining COMPILER_PREFIX for autoconf format.

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

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 1f12cee312a5d1d5d9866a72b740047b99967b72..e4f3b7d8a4fa736628e3dee67f4015033c5a05f8 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -13,21 +13,21 @@
 #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 <map>
@@ -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 ;
         }
 
@@ -840,8 +840,8 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID,
     }
 }
 
-#include <wx/arrimpl.cpp>
+#include "wx/arrimpl.cpp"
 
-WX_DEFINE_OBJARRAY(wxxVariantArray);
+WX_DEFINE_OBJARRAY(wxxVariantArray)
 
-#endif
+#endif // wxUSE_EXTENDED_RTTI