make wxSocketImplUnix inherit from wxFDIOHandler as they're used for almost the same purpose; this removes the need for the bridge wxSocketOHandler class

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-28 14:39:49 +00:00
parent 9123889f20
commit a9d859df6f
9 changed files with 89 additions and 151 deletions

View File

@@ -672,7 +672,7 @@ int wxSocketImplUnix::Read(char *buffer, int size)
if (m_use_events)
{
m_detected = wxSOCKET_LOST_FLAG;
Detected_Read();
OnReadWaiting();
return 0;
}
}
@@ -974,11 +974,10 @@ void wxSocketImplUnix::OnStateChange(wxSocketNotify event)
Shutdown();
}
void wxSocketImplUnix::Detected_Read()
void wxSocketImplUnix::OnReadWaiting()
{
char c;
/* Safeguard against straggling call to Detected_Read */
if (m_fd == INVALID_SOCKET)
{
return;
@@ -1035,7 +1034,7 @@ void wxSocketImplUnix::Detected_Read()
}
}
void wxSocketImplUnix::Detected_Write()
void wxSocketImplUnix::OnWriteWaiting()
{
/* If we have already detected a LOST event, then don't try
* to do any further processing.
@@ -1077,6 +1076,11 @@ void wxSocketImplUnix::Detected_Write()
}
}
void wxSocketImplUnix::OnExceptionWaiting()
{
wxFAIL_MSG( "not supposed to be called" );
}
/*
* -------------------------------------------------------------------------
* GAddress