fix for using wxDataObjectComposite with the clipboard

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

diff --git a/src/common/objstrm.cpp b/src/common/objstrm.cpp
index 6f6c6e607f8942ddc02d2b6da1595d64ad29d1f2..e0156b200dd51ba569bc88bb5c04f5b88b5621e8 100644 (file)
--- a/src/common/objstrm.cpp
+++ b/src/common/objstrm.cpp
@@ -8,23 +8,19 @@
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

+

 #ifdef __GNUG__
 #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__
 #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
 
 #endif
 

-#if wxUSE_SERIAL
+#if wxUSE_SERIAL && wxUSE_STREAMS

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


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

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

   return name;
 }
 
   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));
   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());
     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);
   } else {
     data_s.WriteString(TAG_EMPTY_OBJECT);

-    wxPrintf(_T("info.object (NULL)\n"));
+    wxPrintf(wxT("info.object (NULL)\n"));

     return;
   }
 
     return;
   }
 


@@ -326,5 +322,5 @@ wxObject *wxObjectInputStream::LoadObject()
   return object;
 }
 
   return object;
 }
 

-#endif
+#endif // wxUSE_SERIAL && wxUSE_STREAMS