Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wx/wxprec.h already includes wx/defs.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-18 07:24:35 +00:00
parent 2c1e249967
commit 8898456df4
40 changed files with 282 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/sckstrm.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: sckstrm.h
// Name: src/common/sckstrm.cpp
// Purpose: wxSocket*Stream
// Author: Guilhem Lavaux
// Modified by:
@@ -13,15 +13,14 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/defs.h"
#pragma hdrstop
#endif
#if wxUSE_SOCKETS && wxUSE_STREAMS
#ifndef WX_PRECOMP
#endif
#include "wx/stream.h"
#include "wx/socket.h"
#include "wx/sckstrm.h"
@@ -41,11 +40,11 @@ wxSocketOutputStream::~wxSocketOutputStream()
size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
{
size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
return ret;
return ret;
}
// ---------------------------------------------------------------------------
@@ -63,11 +62,11 @@ wxSocketInputStream::~wxSocketInputStream()
size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
{
size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
return ret;
return ret;
}
// ---------------------------------------------------------------------------