From f784a2a96b7e6b951a0c297c8a50474c066b642b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 15 Nov 2005 18:05:48 +0000 Subject: [PATCH] unhide wxConnectionBase::Execute(wxString) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/sckipc.h | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h index efe0fcd27a..70ea564b78 100644 --- a/include/wx/sckipc.h +++ b/include/wx/sckipc.h @@ -81,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; @@ -92,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; @@ -126,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(); @@ -146,6 +140,9 @@ public: // Callbacks to CLIENT - override at will virtual wxConnectionBase *OnMakeConnection(); + +private: + DECLARE_DYNAMIC_CLASS(wxTCPClient) }; #endif // wxUSE_SOCKETS && wxUSE_IPC -- 2.45.2