handle correctly never/always shown scrollbars in GetClientSize()

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

diff --git a/src/common/xtistrm.cpp b/src/common/xtistrm.cpp
index 6438ed28159c67ef7e4aeddf0516f8848dc5629a..2a73a29f77b69c502437a73744e84183199929ac 100644 (file)
--- a/src/common/xtistrm.cpp
+++ b/src/common/xtistrm.cpp
@@ -9,29 +9,25 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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__
 // For compilers that support precompilation, includes "wx.h".
 #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>


@@ -288,7 +284,7 @@ void wxWriter::WriteOneProperty( const wxObject *obj , const wxClassInfo* ci , c
                 if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() )
                     return ;
             }
                 if ( value.GetAsString() == pi->GetDefaultValue().GetAsString() )
                     return ;
             }

-            
+

             // avoid streaming out null objects
             const wxClassTypeInfo* cti = dynamic_cast< const wxClassTypeInfo* > ( pi->GetTypeInfo() ) ;
 
             // 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" ) ) ;
     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() ;
 }


@@ -433,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 ;
         }
 


@@ -582,7 +578,7 @@ void wxRuntimeDepersister::SetConnect(int eventSourceObjectID,
                     handlerInfo->GetEventFunction() , NULL /*user data*/ ,
                     ehsink ) ;
             }
                     handlerInfo->GetEventFunction() , NULL /*user data*/ ,
                     ehsink ) ;
             }

-        }        
+        }

     }
 }
 
     }
 }
 


@@ -844,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