X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3e646b47f99fd832ab29c07554b533ea8a807e4..221ed5767f7ef4d51b0bbef50ec9f53edfaa46f2:/src/common/socket.cpp diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 7ec0743ec1..9df24e42c9 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -862,9 +862,10 @@ char *wxSocketBase::CallbackData(char *data) // decoupled from wx_socket_callback and thus they suffer from a variety // of problems. Avoid them where possible and use events instead. -static void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), - GSocketEvent notification, - char *cdata) +extern "C" +void LINKAGEMODE wx_socket_callback(GSocket * WXUNUSED(socket), + GSocketEvent notification, + char *cdata) { wxSocketBase *sckobj = (wxSocketBase *)cdata; @@ -1235,25 +1236,6 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr, return (*this); } -// ========================================================================== -// wxSocketEvent -// ========================================================================== - -wxSocketEvent::wxSocketEvent(int id) : wxEvent(id) -{ - SetEventType( (wxEventType)wxEVT_SOCKET ); -} - -void wxSocketEvent::CopyObject(wxObject& object_dest) const -{ - wxSocketEvent *event = (wxSocketEvent *)&object_dest; - - wxEvent::CopyObject(object_dest); - - event->m_event = m_event; - event->m_clientData = m_clientData; -} - // ========================================================================== // wxSocketModule // ==========================================================================