projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[wxWidgets.git]
/
src
/
common
/
objstrm.cpp
diff --git
a/src/common/objstrm.cpp
b/src/common/objstrm.cpp
index ca069bdb68b6f7b80cdb0231faab623e3c9694ed..0488a6b90d3c7a46106de747988e2f858f92675b 100644
(file)
--- a/
src/common/objstrm.cpp
+++ b/
src/common/objstrm.cpp
@@
-16,15
+16,10
@@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+
#pragma hdrstop
#endif
#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"
#include "wx/object.h"
#include "wx/objstrm.h"
@@
-50,7
+45,7
@@
wxString wxObjectOutputStream::GetObjectName(wxObject *obj)
{
wxString name;
{
wxString name;
- name.Printf(
"%x"
, (unsigned long)obj);
+ name.Printf(
wxT("%x")
, (unsigned long)obj);
return name;
}
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));
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());
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);
} else {
data_s.WriteString(TAG_EMPTY_OBJECT);
-
printf("info.object (NULL)\n"
);
+
wxPrintf(wxT("info.object (NULL)\n")
);
return;
}
return;
}