use MoreFiles under Mac OS X

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

diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index 5bc2ae125e4ad43fc9c8bcd05bb124cd474c7d7b..6b89bea73d59ac11fb6b3181beb8ec9cade98c6c 100644 (file)
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -15,6 +15,9 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"

+#if defined(__WINDOWS__)
+#include "wx/msw/private.h"
+#endif

 
 #include "wx/serbase.h"
 #include "wx/datstrm.h"
 
 #include "wx/serbase.h"
 #include "wx/datstrm.h"


@@ -24,17 +27,16 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL

 
 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)

+

 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)

-#endif

 
 void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 {
 
 void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 {


@@ -57,7 +59,7 @@ void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 
   if (lst_object->GetKeyType() == wxKEY_INTEGER) {
     while (node) {
 
   if (lst_object->GetKeyType() == wxKEY_INTEGER) {
     while (node) {

-      data_s.Write32(node->GetKeyInteger());
+      data_s.Write32((size_t)node->GetKeyInteger());

       node = node->Next();
     }
   } else {
       node = node->Next();
     }
   } else {


@@ -74,7 +76,7 @@ void WXSERIAL(wxList)::LoadObject(wxObjectInputStream& s)
   wxList *list = (wxList *)Object();
   int number, i;
 
   wxList *list = (wxList *)Object();
   int number, i;
 

-  list->DeleteContents( data_s.Read8() );
+  list->DeleteContents( data_s.Read8() != 0 );

   list->SetKeyType( (wxKeyType) data_s.Read8() );
   number = data_s.Read32();
 
   list->SetKeyType( (wxKeyType) data_s.Read8() );
   number = data_s.Read32();