fingers crossed..

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

diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index 803893ec9c7696751b27eb0a03a197d77736da40..7ad3a46705251d2d9fd59e0c470d055fc2151ac2 100644 (file)
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -13,10 +13,11 @@
 #pragma implementation "serbase.h"
 #endif
 
-#ifdef wxUSE_SERIAL
-
 // 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"
@@ -26,15 +27,16 @@
 #pragma hdrstop
 #endif
 
+#if wxUSE_SERIAL
+
 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)
+
 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
-#endif
 
 void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 {
@@ -57,7 +59,7 @@ void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 
   if (lst_object->GetKeyType() == wxKEY_INTEGER) {
     while (node) {
-      data_s.Write32(node->GetKeyInteger());
+      data_s.Write32((size_t)node->GetKeyInteger());
       node = node->Next();
     }
   } else {
@@ -121,4 +123,4 @@ void WXSERIAL(wxHashTable)::LoadObject(wxObjectInputStream& s)
     table->hash_table[i] = (wxList *)s.GetChild();
 }
 
-#endif
+#endif // wxUSE_SERIAL