X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/856d2e527d20faf46ce40734e858c7cc92b2f704..1c383dbac927bbcc728365b2f8894a5ce676b19b:/src/common/objstrm.cpp diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp index ca069bdb68..0488a6b90d 100644 --- a/src/common/objstrm.cpp +++ b/src/common/objstrm.cpp @@ -16,15 +16,10 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/setup.h" -#endif - -#if USE_SERIAL +#if wxUSE_SERIAL && wxUSE_STREAMS #include "wx/object.h" #include "wx/objstrm.h" @@ -50,7 +45,7 @@ wxString wxObjectOutputStream::GetObjectName(wxObject *obj) { wxString name; - name.Printf("%x", (unsigned long)obj); + name.Printf(wxT("%x"), (unsigned long)obj); return name; } @@ -63,16 +58,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; }