X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..f2616db56739e4962f683f59ac9e207756efe23c:/src/common/serbase.cpp diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp index 5bc0943b9e..6b89bea73d 100644 --- 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" +#if defined(__WINDOWS__) +#include "wx/msw/private.h" +#endif #include "wx/serbase.h" #include "wx/datstrm.h" @@ -56,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 { @@ -73,7 +76,7 @@ void WXSERIAL(wxList)::LoadObject(wxObjectInputStream& s) 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();