1. many, many, many warnings fixed (from HP-UX build log; 50% are still left)
2. attempt (failed) at compiling wxGTK with GTK+ 1.3.0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
// Modified by:
|
||||
// Created: 28/06/98
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Guilhem Lavaux
|
||||
// Copyright: (c) Guilhem Lavaux
|
||||
// Licence: wxWindows license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -86,22 +86,17 @@ double wxDataInputStream::ReadDouble()
|
||||
|
||||
wxString wxDataInputStream::ReadString()
|
||||
{
|
||||
wxString wx_string;
|
||||
char *string;
|
||||
unsigned long len;
|
||||
wxString s;
|
||||
size_t len;
|
||||
|
||||
len = Read32();
|
||||
string = new char[len+1];
|
||||
|
||||
m_input->Read(string, len);
|
||||
m_input->Read(s.GetWriteBuf(len), len);
|
||||
s.UngetWriteBuf();
|
||||
|
||||
string[len] = 0;
|
||||
wx_string = string;
|
||||
delete string;
|
||||
|
||||
return wx_string;
|
||||
return s;
|
||||
}
|
||||
|
||||
|
||||
wxDataInputStream& wxDataInputStream::operator>>(wxString& s)
|
||||
{
|
||||
s = ReadString();
|
||||
@@ -285,4 +280,4 @@ wxDataOutputStream& wxDataOutputStream::operator<<(float f)
|
||||
|
||||
#endif
|
||||
// wxUSE_STREAMS
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user