X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/968eb2ef396c78442ffea7a2463f3777ca6d1632..59720690dfa73732d165642d6e9cb8330a92549b:/include/wx/sckipc.h diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index ab06fb943e..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 @@ -85,6 +81,10 @@ public: // 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,20 +96,11 @@ 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 WXDLLIMPEXP_NET wxTCPServer: public wxServerBase { - DECLARE_DYNAMIC_CLASS(wxTCPServer) - public: wxTCPConnection *topLevelConnection; @@ -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 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