Added GSocket for Unix (only GTK for the moment)
Updated wxSocket to use GSocket API Added a progress bar to client.cpp Added CopyTo to wxMemoryOutputStream to copy the internal buffer to a specified buffer. Various changes/fixes to the high-level protocols FTP/HTTP Various Unicode fixes Removed sckint.* git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -480,6 +480,9 @@ size_t wxInputStream::GetWBack(char *buf, size_t bsize)
|
||||
{
|
||||
size_t s_toget = m_wbacksize-m_wbackcur;
|
||||
|
||||
if (!m_wback)
|
||||
return 0;
|
||||
|
||||
if (bsize < s_toget)
|
||||
s_toget = bsize;
|
||||
|
||||
@@ -697,8 +700,8 @@ wxInputStream& wxBufferedInputStream::Read(void *buffer, size_t size)
|
||||
char *buf = (char *)buffer;
|
||||
|
||||
retsize = GetWBack(buf, size);
|
||||
m_lastcount = retsize;
|
||||
if (retsize == size) {
|
||||
m_lastcount = size;
|
||||
m_lasterror = wxStream_NOERROR;
|
||||
return *this;
|
||||
}
|
||||
@@ -753,6 +756,7 @@ wxBufferedOutputStream::~wxBufferedOutputStream()
|
||||
|
||||
wxOutputStream& wxBufferedOutputStream::Write(const void *buffer, size_t size)
|
||||
{
|
||||
m_lastcount = 0;
|
||||
m_o_streambuf->Write(buffer, size);
|
||||
return *this;
|
||||
}
|
||||
|
Reference in New Issue
Block a user