X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84fff0b395adcfecd09dd65389ba7c1c47dd7eee..da2b4b7a57f816723ed26dbbeca0549b9ce6735a:/src/common/objstrm.cpp diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp index 6f6c6e607f..e0156b200d 100644 --- a/src/common/objstrm.cpp +++ b/src/common/objstrm.cpp @@ -8,23 +8,19 @@ // 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 - -#ifndef WX_PRECOMP -#include "wx/defs.h" -#include "wx/setup.h" + #pragma hdrstop #endif -#if wxUSE_SERIAL +#if wxUSE_SERIAL && wxUSE_STREAMS #include "wx/object.h" #include "wx/objstrm.h" @@ -50,7 +46,7 @@ wxString wxObjectOutputStream::GetObjectName(wxObject *obj) { wxString name; - name.Printf(_T("%x"), (unsigned long)obj); + name.Printf(wxT("%x"), (unsigned long)obj); return name; } @@ -63,16 +59,16 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info) if (info.duplicate) { data_s.WriteString(TAG_DUPLICATE_OBJECT); data_s.WriteString(GetObjectName(info.object)); - wxPrintf(_T("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()); - wxPrintf(_T("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); - wxPrintf(_T("info.object (NULL)\n")); + wxPrintf(wxT("info.object (NULL)\n")); return; } @@ -326,5 +322,5 @@ wxObject *wxObjectInputStream::LoadObject() return object; } -#endif +#endif // wxUSE_SERIAL && wxUSE_STREAMS