1. wxWindow::IsTopLevel() added and documented

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 80dbb536fc3d0c8a3b1fa298c9041470182db987..bdf796f7c2f94fb8bd7ee63b5ee9c740500ad006 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -26,6 +26,10 @@
 
 #include "wx/datstrm.h"
 
 
 #include "wx/datstrm.h"
 

+// ---------------------------------------------------------------------------
+// wxDataInputStream
+// ---------------------------------------------------------------------------
+

 wxDataInputStream::wxDataInputStream(wxInputStream& s)
   : wxFilterInputStream(s)
 {
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
   : wxFilterInputStream(s)
 {


@@ -70,7 +74,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);


@@ -123,9 +127,13 @@ wxString wxDataInputStream::ReadString()
   wx_string = string;
   delete string;
 
   wx_string = string;
   delete string;
 

-  return wx_string; 
+  return wx_string;

 }
 
 }
 

+// ---------------------------------------------------------------------------
+// wxDataOutputStream
+// ---------------------------------------------------------------------------
+

 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
  : wxFilterOutputStream(s)
 {
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
  : wxFilterOutputStream(s)
 {


@@ -163,18 +171,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


@@ -184,10 +192,10 @@ 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);