* wxMemory*Stream link problem fix.
* wxData*Stream update. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,9 +44,6 @@ unsigned long wxDataInputStream::Read32()
|
||||
{
|
||||
char buf[4];
|
||||
|
||||
if (!m_parent_i_stream)
|
||||
return 0;
|
||||
|
||||
Read(buf, 4);
|
||||
|
||||
return (unsigned long)buf[0] |
|
||||
@@ -59,9 +56,6 @@ unsigned short wxDataInputStream::Read16()
|
||||
{
|
||||
char buf[2];
|
||||
|
||||
if (!m_parent_i_stream)
|
||||
return 0;
|
||||
|
||||
Read(buf, 2);
|
||||
|
||||
return (unsigned short)buf[0] |
|
||||
@@ -72,9 +66,6 @@ unsigned char wxDataInputStream::Read8()
|
||||
{
|
||||
char buf;
|
||||
|
||||
if (!m_parent_i_stream)
|
||||
return 0;
|
||||
|
||||
Read(&buf, 1);
|
||||
return (unsigned char)buf;
|
||||
}
|
||||
@@ -87,9 +78,6 @@ double wxDataInputStream::ReadDouble()
|
||||
#if USE_APPLE_IEEE
|
||||
char buf[10];
|
||||
|
||||
if (!m_parent_i_stream)
|
||||
return 0.0;
|
||||
|
||||
Read(buf, 10);
|
||||
return ConvertFromIeeeExtended((unsigned char *)buf);
|
||||
#else
|
||||
@@ -101,9 +89,6 @@ wxString wxDataInputStream::ReadLine()
|
||||
{
|
||||
char i_strg[255];
|
||||
|
||||
if (!m_parent_i_stream)
|
||||
return "";
|
||||
|
||||
// TODO: Implement ReadLine
|
||||
return i_strg;
|
||||
}
|
||||
@@ -114,9 +99,6 @@ wxString wxDataInputStream::ReadString()
|
||||
char *string;
|
||||
unsigned long len;
|
||||
|
||||
if (!m_parent_i_stream)
|
||||
return "";
|
||||
|
||||
len = Read32();
|
||||
string = new char[len+1];
|
||||
|
||||
@@ -142,9 +124,6 @@ void wxDataOutputStream::Write32(unsigned long i)
|
||||
{
|
||||
char buf[4];
|
||||
|
||||
if (!m_parent_o_stream)
|
||||
return;
|
||||
|
||||
buf[0] = i & 0xff;
|
||||
buf[1] = (i >> 8) & 0xff;
|
||||
buf[2] = (i >> 16) & 0xff;
|
||||
@@ -156,9 +135,6 @@ void wxDataOutputStream::Write16(unsigned short i)
|
||||
{
|
||||
char buf[2];
|
||||
|
||||
if (!m_parent_o_stream)
|
||||
return;
|
||||
|
||||
buf[0] = i & 0xff;
|
||||
buf[1] = (i >> 8) & 0xff;
|
||||
Write(buf, 2);
|
||||
@@ -166,9 +142,6 @@ void wxDataOutputStream::Write16(unsigned short i)
|
||||
|
||||
void wxDataOutputStream::Write8(unsigned char i)
|
||||
{
|
||||
if (!m_parent_o_stream)
|
||||
return;
|
||||
|
||||
Write(&i, 1);
|
||||
}
|
||||
|
||||
@@ -180,17 +153,11 @@ void wxDataOutputStream::WriteLine(const wxString& line)
|
||||
wxString tmp_string = line + '\n';
|
||||
#endif
|
||||
|
||||
if (!m_parent_o_stream)
|
||||
return;
|
||||
|
||||
Write((const char *) tmp_string, tmp_string.Length());
|
||||
}
|
||||
|
||||
void wxDataOutputStream::WriteString(const wxString& string)
|
||||
{
|
||||
if (!m_parent_o_stream)
|
||||
return;
|
||||
|
||||
Write32(string.Length());
|
||||
Write((const char *) string, string.Length());
|
||||
}
|
||||
@@ -202,9 +169,6 @@ void wxDataOutputStream::WriteDouble(double d)
|
||||
{
|
||||
char buf[10];
|
||||
|
||||
if (!m_parent_o_stream)
|
||||
return;
|
||||
|
||||
#if USE_APPLE_IEEE
|
||||
ConvertToIeeeExtended(d, (unsigned char *)buf);
|
||||
#else
|
||||
|
Reference in New Issue
Block a user