X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fa03f04345b620d1a14529b05961116b20a1297..46bde8dcf2245956223da69cce5bf93ba22a087e:/include/wx/socket.h diff --git a/include/wx/socket.h b/include/wx/socket.h index 2cd5df584a..ac1c7d3640 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -12,10 +12,6 @@ #ifndef _WX_SOCKET_H_ #define _WX_SOCKET_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "socket.h" -#endif - #include "wx/defs.h" #if wxUSE_SOCKETS @@ -234,7 +230,7 @@ class WXDLLIMPEXP_NET wxSocketServer : public wxSocketBase DECLARE_CLASS(wxSocketServer) public: - wxSocketServer(wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE); + wxSocketServer(const wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE); wxSocketBase* Accept(bool wait = true); bool AcceptWith(wxSocketBase& socket, bool wait = true); @@ -276,12 +272,12 @@ class WXDLLIMPEXP_NET wxDatagramSocket : public wxSocketBase DECLARE_CLASS(wxDatagramSocket) public: - wxDatagramSocket(wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE); + wxDatagramSocket(const wxSockAddress& addr, wxSocketFlags flags = wxSOCKET_NONE); wxDatagramSocket& RecvFrom( wxSockAddress& addr, void* buf, wxUint32 nBytes ); - wxDatagramSocket& SendTo( wxSockAddress& addr, + wxDatagramSocket& SendTo( const wxSockAddress& addr, const void* buf, wxUint32 nBytes ); @@ -321,7 +317,7 @@ public: typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&); #define wxSocketEventHandler(func) \ - (wxObjectEventFunction)wxStaticCastEvent(wxSocketEventFunction, &func) + (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxSocketEventFunction, &func) #define EVT_SOCKET(id, func) \ wx__DECLARE_EVT1(wxEVT_SOCKET, id, wxSocketEventHandler(func))