* wxDataStreams use wxUint now.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index e3bb7eeb800cd0f181c3b42f5ce6fd6ab8d362c1..e0c4bfe7ffa8b5e96a2e3e22a5a1fb69a87865b9 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -25,9 +25,9 @@ public:
   wxDataInputStream(wxInputStream& s);
   virtual ~wxDataInputStream();
 
-  unsigned long Read32();
-  unsigned short Read16();
-  unsigned char Read8();
+  wxUint32 Read32();
+  wxUint16 Read16();
+  wxUint8 Read8();
   double ReadDouble();
   wxString ReadLine();
   wxString ReadString();
@@ -38,9 +38,9 @@ class WXDLLEXPORT wxDataOutputStream: public wxFilterOutputStream {
   wxDataOutputStream(wxOutputStream& s);
   virtual ~wxDataOutputStream();
 
-  void Write32(unsigned long i);
-  void Write16(unsigned short i);
-  void Write8(unsigned char i);
+  void Write32(wxUint32 i);
+  void Write16(wxUint16 i);
+  void Write8(wxUint8 i);
   void WriteDouble(double d);
   void WriteLine(const wxString& line);
   void WriteString(const wxString& string);

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index d83f968795578e4d6d070a71fe207ef8d7ddd325..cab308f18ed0ec7abe1586bc2dcae268572a13fb 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -37,34 +37,34 @@ wxDataInputStream::~wxDataInputStream()
 {
 }
 
-unsigned long wxDataInputStream::Read32()
+wxUint32 wxDataInputStream::Read32()
 {
   char buf[4];
 
   Read(buf, 4);
 
-  return (unsigned long)buf[0] |
-         ((unsigned long)buf[1] << 8) |
-         ((unsigned long)buf[2] << 16) |
-         ((unsigned long)buf[3] << 24);
+  return (wxUint32)buf[0] |
+         ((wxUint32)buf[1] << 8) |
+         ((wxUint32)buf[2] << 16) |
+         ((wxUint32)buf[3] << 24);
 }
 
-unsigned short wxDataInputStream::Read16()
+wxUint16 wxDataInputStream::Read16()
 {
   char buf[2];
 
   Read(buf, 2);
 
-  return (unsigned short)buf[0] |
-         ((unsigned short)buf[1] << 8);
+  return (wxUint16)buf[0] |
+         ((wxUint16)buf[1] << 8);
 }
 
-unsigned char wxDataInputStream::Read8()
+wxUint8 wxDataInputStream::Read8()
 {
-  char buf;
+  wxUint8 buf;
 
-  Read(&buf, 1);
-  return (unsigned char)buf;
+  Read((char *)&buf, 1);
+  return (wxUint8)buf;
 }
 
 // Must be at global scope for VC++ 5
@@ -144,7 +144,7 @@ wxDataOutputStream::~wxDataOutputStream()
 {
 }
 
-void wxDataOutputStream::Write32(unsigned long i)
+void wxDataOutputStream::Write32(wxUint32 i)
 {
   char buf[4];
 
@@ -155,7 +155,7 @@ void wxDataOutputStream::Write32(unsigned long i)
   Write(buf, 4);
 }
 
-void wxDataOutputStream::Write16(unsigned short i)
+void wxDataOutputStream::Write16(wxUint16 i)
 {
   char buf[2];
 
@@ -164,7 +164,7 @@ void wxDataOutputStream::Write16(unsigned short i)
   Write(buf, 2);
 }
 
-void wxDataOutputStream::Write8(unsigned char i)
+void wxDataOutputStream::Write8(wxUint8 i)
 {
   Write(&i, 1);
 }