X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..a69aabc360d54a93e355fab72c6513c75aaa7337:/include/wx/sckipc.h diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index 9a49fb98ca..70ea564b78 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -16,10 +16,6 @@ #ifndef _WX_SCKIPC_H #define _WX_SCKIPC_H -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "sckipc.h" -#endif - #include "wx/defs.h" #if wxUSE_SOCKETS && wxUSE_IPC @@ -79,12 +75,16 @@ public: virtual bool Disconnect(void); // Callbacks to BOTH - override at will - // Default behaviour is to delete connection and return TRUE - virtual bool OnDisconnect(void) { delete this; return TRUE; } + // Default behaviour is to delete connection and return true + virtual bool OnDisconnect(void) { delete this; return true; } // To enable the compressor (NOTE: not implemented!) void Compress(bool on); + // unhide the Execute overload from wxConnectionBase + virtual bool Execute(const wxString& str) + { return Execute(str, -1, wxIPC_TEXT); } + protected: wxSocketBase *m_sock; wxSocketStream *m_sockstrm; @@ -96,27 +96,18 @@ protected: friend class wxTCPClient; friend class wxTCPEventHandler; -private: - // - // We're hiding an Execute method in ConnectionBase - // - virtual bool Execute(const wxString& str) - { return Execute(str, -1, wxIPC_TEXT); } - - DECLARE_NO_COPY_CLASS(wxTCPConnection) + DECLARE_NO_COPY_CLASS(wxTCPConnection) }; -class wxTCPServer: public wxServerBase +class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase { - DECLARE_DYNAMIC_CLASS(wxTCPServer) - public: wxTCPConnection *topLevelConnection; wxTCPServer(); virtual ~wxTCPServer(); - // Returns FALSE on error (e.g. port number is already in use) + // Returns false on error (e.g. port number is already in use) virtual bool Create(const wxString& serverName); // Callbacks to SERVER - override at will @@ -130,13 +121,12 @@ protected: wxString m_filename; #endif // __UNIX_LIKE__ - DECLARE_NO_COPY_CLASS(wxTCPServer) + DECLARE_NO_COPY_CLASS(wxTCPServer) + DECLARE_DYNAMIC_CLASS(wxTCPServer) }; -class wxTCPClient: public wxClientBase +class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase { - DECLARE_DYNAMIC_CLASS(wxTCPClient) - public: wxTCPClient(); virtual ~wxTCPClient(); @@ -150,6 +140,9 @@ public: // Callbacks to CLIENT - override at will virtual wxConnectionBase *OnMakeConnection(); + +private: + DECLARE_DYNAMIC_CLASS(wxTCPClient) }; #endif // wxUSE_SOCKETS && wxUSE_IPC