Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 016305e74c530a8a0d3c54aa0641d546278e5336..2a73a29f77b69c502437a73744e84183199929ac 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -13,21 +13,21 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_EXTENDED_RTTI
+
+#include "wx/xtistrm.h"
+

 #ifndef WX_PRECOMP
 #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"
 #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>
 
 #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" ) ) ;
     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 ;
         }
 


@@ -844,4 +844,4 @@ void wxCodeDepersister::SetConnect(int eventSourceObjectID,
 
 WX_DEFINE_OBJARRAY(wxxVariantArray);
 
 
 WX_DEFINE_OBJARRAY(wxxVariantArray);
 

-#endif
+#endif // wxUSE_EXTENDED_RTTI