standard icons for msg boxes

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 8056bdadedc5693536d51efcb5bf5d4d23bad2a7..aff9c5355cf36a51f181592488ae842489eb420b 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -17,13 +17,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+  #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+  #include "wx/defs.h"

 #endif
 
 #endif
 

+#if wxUSE_STREAMS
+

 #include "wx/datstrm.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/datstrm.h"
 
 // ---------------------------------------------------------------------------


@@ -74,7 +76,7 @@ extern "C" double ConvertFromIeeeExtended(const unsigned char *bytes);
 
 double wxDataInputStream::ReadDouble()
 {
 
 double wxDataInputStream::ReadDouble()
 {

-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

   char buf[10];
 
   Read(buf, 10);
   char buf[10];
 
   Read(buf, 10);


@@ -171,18 +173,18 @@ void wxDataOutputStream::Write8(unsigned char i)
 void wxDataOutputStream::WriteLine(const wxString& line)
 {
 #ifdef __WXMSW__
 void wxDataOutputStream::WriteLine(const wxString& line)
 {
 #ifdef __WXMSW__

-  wxString tmp_string = line + "\r\n";
+  wxString tmp_string = line + _T("\r\n");

 #else
 #else

-  wxString tmp_string = line + '\n';
+  wxString tmp_string = line + _T('\n');

 #endif
 
 #endif
 

-  Write((const char *) tmp_string, tmp_string.Length());
+  Write((const wxChar *) tmp_string, tmp_string.Length()*sizeof(wxChar));

 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write32(string.Length());
 }
 
 void wxDataOutputStream::WriteString(const wxString& string)
 {
   Write32(string.Length());

-  Write((const char *) string, string.Length());
+  Write((const wxChar *) string, string.Length()*sizeof(wxChar));

 }
 
 // Must be at global scope for VC++ 5
 }
 
 // Must be at global scope for VC++ 5


@@ -192,20 +194,15 @@ void wxDataOutputStream::WriteDouble(double d)
 {
   char buf[10];
 
 {
   char buf[10];
 

-#if USE_APPLE_IEEE
+#if wxUSE_APPLE_IEEE

   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else

-#  pragma warning "wxDataStream::WriteDouble() not using IeeeExtended - will not work!"
+#  pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"

  buf[0] = '\0';
 #endif
   Write(buf, 10);
 }
 
  buf[0] = '\0';
 #endif
   Write(buf, 10);
 }
 

-// ---------------------------------------------------------------------------
-// wxDataStream
-// ---------------------------------------------------------------------------
-
-wxDataStream::wxDataStream(wxStream& stream)
- : wxDataInputStream(stream), wxDataOutputStream(stream)
-{
-}
+#endif
+  // wxUSE_STREAMS
+  
\ No newline at end of file