make wxSocketImplUnix inherit from wxFDIOHandler as they're used for almost the same...

[wxWidgets.git] / src / unix / sockunix.cpp

diff --git a/src/unix/sockunix.cpp b/src/unix/sockunix.cpp
index 1893e118e88ca491c1c8943495d40f390567dc7d..3fd9875c8bfc9478bd04a6d25f9fad42266a60bd 100644 (file)
--- a/src/unix/sockunix.cpp
+++ b/src/unix/sockunix.cpp
@@ -672,7 +672,7 @@ int wxSocketImplUnix::Read(char *buffer, int size)
       if (m_use_events)
       {
         m_detected = wxSOCKET_LOST_FLAG;
       if (m_use_events)
       {
         m_detected = wxSOCKET_LOST_FLAG;

-        Detected_Read();
+        OnReadWaiting();

         return 0;
       }
     }
         return 0;
       }
     }


@@ -974,11 +974,10 @@ void wxSocketImplUnix::OnStateChange(wxSocketNotify event)
         Shutdown();
 }
 
         Shutdown();
 }
 

-void wxSocketImplUnix::Detected_Read()
+void wxSocketImplUnix::OnReadWaiting()

 {
   char c;
 
 {
   char c;
 

-  /* Safeguard against straggling call to Detected_Read */

   if (m_fd == INVALID_SOCKET)
   {
     return;
   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.
 {
   /* 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
 /*
  * -------------------------------------------------------------------------
  * GAddress