old makefiles removed

[wxWidgets.git] / src / common / objstrm.cpp

diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp
index ca069bdb68b6f7b80cdb0231faab623e3c9694ed..6f6c6e607f8942ddc02d2b6da1595d64ad29d1f2 100644 (file)
--- a/src/common/objstrm.cpp
+++ b/src/common/objstrm.cpp
@@ -24,7 +24,7 @@
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 

-#if USE_SERIAL
+#if wxUSE_SERIAL

 
 #include "wx/object.h"
 #include "wx/objstrm.h"
 
 #include "wx/object.h"
 #include "wx/objstrm.h"


@@ -50,7 +50,7 @@ wxString wxObjectOutputStream::GetObjectName(wxObject *obj)
 {
   wxString name;
 
 {
   wxString name;
 

-  name.Printf("%x", (unsigned long)obj);
+  name.Printf(_T("%x"), (unsigned long)obj);

   return name;
 }
 
   return name;
 }
 


@@ -63,16 +63,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(_T("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(_T("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(_T("info.object (NULL)\n"));

     return;
   }
 
     return;
   }