unhide wxConnectionBase::Execute(wxString)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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)
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxTCPServer)
|
||||
|
||||
public:
|
||||
wxTCPConnection *topLevelConnection;
|
||||
|
||||
@@ -127,12 +122,11 @@ protected:
|
||||
#endif // __UNIX_LIKE__
|
||||
|
||||
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
|
||||
|
Reference in New Issue
Block a user