Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unhide wxConnectionBase::Execute(wxString)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-11-15 18:05:48 +00:00
parent c9eee7f035
commit f784a2a96b
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/sckipc.h
View File

@@ -81,6 +81,10 @@ public:
// To enable the compressor (NOTE: not implemented!) // To enable the compressor (NOTE: not implemented!)
void Compress(bool on); void Compress(bool on);
// unhide the Execute overload from wxConnectionBase
virtual bool Execute(const wxString& str)
{ return Execute(str, -1, wxIPC_TEXT); }
protected: protected:
wxSocketBase *m_sock; wxSocketBase *m_sock;
wxSocketStream *m_sockstrm; wxSocketStream *m_sockstrm;
@@ -92,20 +96,11 @@ protected:
friend class wxTCPClient; friend class wxTCPClient;
friend class wxTCPEventHandler; 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 class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase
{ {
DECLARE_DYNAMIC_CLASS(wxTCPServer)
public: public:
wxTCPConnection *topLevelConnection; wxTCPConnection *topLevelConnection;
@@ -127,12 +122,11 @@ protected:
#endif // __UNIX_LIKE__ #endif // __UNIX_LIKE__
DECLARE_NO_COPY_CLASS(wxTCPServer) DECLARE_NO_COPY_CLASS(wxTCPServer)
DECLARE_DYNAMIC_CLASS(wxTCPServer)
}; };
class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase
{ {
DECLARE_DYNAMIC_CLASS(wxTCPClient)
public: public:
wxTCPClient(); wxTCPClient();
virtual ~wxTCPClient(); virtual ~wxTCPClient();
@@ -146,6 +140,9 @@ public:
// Callbacks to CLIENT - override at will // Callbacks to CLIENT - override at will
virtual wxConnectionBase *OnMakeConnection(); virtual wxConnectionBase *OnMakeConnection();
private:
DECLARE_DYNAMIC_CLASS(wxTCPClient)
}; };
#endif // wxUSE_SOCKETS && wxUSE_IPC #endif // wxUSE_SOCKETS && wxUSE_IPC