X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..0c05fdf3570e8066b8a9a16627562e544306a678:/include/wx/socket.h?ds=inline diff --git a/include/wx/socket.h b/include/wx/socket.h index f4d1ecf998..864ba4f96d 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -12,7 +12,7 @@ #ifndef _WX_NETWORK_SOCKET_H #define _WX_NETWORK_SOCKET_H -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "socket.h" #endif @@ -95,43 +95,15 @@ enum wxSocketType typedef int wxSocketFlags; -#if WXWIN_COMPATIBILITY - typedef wxSocketType wxSockType; - typedef wxSocketFlags wxSockFlags; -#endif // WXWIN_COMPATIBILITY - // -------------------------------------------------------------------------- // wxSocketBase // -------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxSocketBase : public wxObject +class WXDLLIMPEXP_NET wxSocketBase : public wxObject { DECLARE_CLASS(wxSocketBase) -public: - -#if WXWIN_COMPATIBILITY - enum - { - NONE = wxSOCKET_NONE, - NOWAIT = wxSOCKET_NOWAIT, - WAITALL = wxSOCKET_WAITALL, - SPEED = wxSOCKET_BLOCK - }; - - enum - { - SOCK_UNINIT = wxSOCKET_UNINIT, - SOCK_CLIENT = wxSOCKET_CLIENT, - SOCK_SERVER = wxSOCKET_SERVER, - SOCK_INTERNAL = wxSOCKET_BASE, - SOCK_DATAGRAM = wxSOCKET_DATAGRAM - }; - - typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata); -#endif // WXWIN_COMPATIBILITY - public: // Public interface @@ -191,12 +163,6 @@ public: static bool Initialize(); static void Shutdown(); - // callbacks are deprecated, use events instead -#if WXWIN_COMPATIBILITY - wxSockCbk Callback(wxSockCbk cbk_); - char *CallbackData(char *data); -#endif // WXWIN_COMPATIBILITY - // Implementation from now on // -------------------------- @@ -256,12 +222,6 @@ private: // the initialization count, GSocket is initialized if > 0 static size_t m_countInit; - // callbacks are deprecated, use events instead -#if WXWIN_COMPATIBILITY - wxSockCbk m_cbk; // callback - char *m_cdata; // callback data -#endif // WXWIN_COMPATIBILITY - DECLARE_NO_COPY_CLASS(wxSocketBase) }; @@ -270,7 +230,7 @@ private: // wxSocketServer // -------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxSocketServer : public wxSocketBase +class WXDLLIMPEXP_NET wxSocketServer : public wxSocketBase { DECLARE_CLASS(wxSocketServer) @@ -290,7 +250,7 @@ public: // wxSocketClient // -------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxSocketClient : public wxSocketBase +class WXDLLIMPEXP_NET wxSocketClient : public wxSocketBase { DECLARE_CLASS(wxSocketClient) @@ -312,7 +272,7 @@ public: // WARNING: still in alpha stage -class WXDLLEXPORT_BASE wxDatagramSocket : public wxSocketBase +class WXDLLIMPEXP_NET wxDatagramSocket : public wxSocketBase { DECLARE_CLASS(wxDatagramSocket) @@ -337,7 +297,7 @@ public: // wxSocketEvent // -------------------------------------------------------------------------- -class WXDLLEXPORT_BASE wxSocketEvent : public wxEvent +class WXDLLIMPEXP_NET wxSocketEvent : public wxEvent { public: wxSocketEvent(int id = 0) @@ -349,19 +309,13 @@ public: wxSocketBase *GetSocket() const { return (wxSocketBase *) GetEventObject(); } void *GetClientData() const { return m_clientData; } - // backwards compatibility -#if WXWIN_COMPATIBILITY_2 - wxSocketNotify SocketEvent() const { return m_event; } - wxSocketBase *Socket() const { return (wxSocketBase *) GetEventObject(); } -#endif // WXWIN_COMPATIBILITY_2 - virtual wxEvent *Clone() const { return new wxSocketEvent(*this); } public: wxSocketNotify m_event; void *m_clientData; - DECLARE_DYNAMIC_CLASS(wxSocketEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent) }; @@ -369,10 +323,8 @@ typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&); #define EVT_SOCKET(id, func) \ DECLARE_EVENT_TABLE_ENTRY( wxEVT_SOCKET, id, -1, \ - (wxObjectEventFunction) \ - (wxEventFunction) \ - (wxSocketEventFunction) & func, \ - (wxObject *) NULL ), + (wxObjectEventFunction) (wxEventFunction) wxStaticCastEvent( wxSocketEventFunction, & func ), \ + (wxObject *) NULL ), #endif