X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4a8c29f7a3ffa7eb60d9b7f055565eb2df368d9..1971d23c57b3c582f32d05704914ad902ec76fa5:/src/common/objstrm.cpp diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp index 2bb34f1c59..e0156b200d 100644 --- a/src/common/objstrm.cpp +++ b/src/common/objstrm.cpp @@ -8,10 +8,20 @@ // Copyright: (c) 1998 Guilhem Lavaux // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// + #ifdef __GNUG__ -#pragma implementation "objstrm.h" + #pragma implementation "objstrm.h" +#endif + +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#ifdef __BORLANDC__ + #pragma hdrstop #endif +#if wxUSE_SERIAL && wxUSE_STREAMS + #include "wx/object.h" #include "wx/objstrm.h" #include "wx/datstrm.h" @@ -36,7 +46,7 @@ wxString wxObjectOutputStream::GetObjectName(wxObject *obj) { wxString name; - name.Printf("%x", (unsigned long)obj); + name.Printf(wxT("%x"), (unsigned long)obj); return name; } @@ -49,16 +59,16 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info) if (info.duplicate) { data_s.WriteString(TAG_DUPLICATE_OBJECT); data_s.WriteString(GetObjectName(info.object)); - printf("info.object (dup %s)\n", info.object->GetClassInfo()->GetClassName()); + wxPrintf(wxT("info.object (dup %s)\n"), info.object->GetClassInfo()->GetClassName()); return; } if (info.object) { data_s.WriteString(info.object->GetClassInfo()->GetClassName()); - printf("info.object (%s)\n", info.object->GetClassInfo()->GetClassName()); + wxPrintf(wxT("info.object (%s)\n"), info.object->GetClassInfo()->GetClassName()); } else { data_s.WriteString(TAG_EMPTY_OBJECT); - printf("info.object (NULL)\n"); + wxPrintf(wxT("info.object (NULL)\n")); return; } @@ -163,6 +173,7 @@ bool wxObjectOutputStream::SaveObject(wxObject& obj) wxObjectInputStream::wxObjectInputStream(wxInputStream& s) : wxFilterInputStream(s) { + m_secondcall = FALSE; } wxObject *wxObjectInputStream::SolveName(const wxString& name) const @@ -310,3 +321,6 @@ wxObject *wxObjectInputStream::LoadObject() return object; } + +#endif // wxUSE_SERIAL && wxUSE_STREAMS +