replaced wxSocketEvent::CopyObject() with Clone()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
0ded6bb695
commit
163f315474
@ -323,10 +323,11 @@ public:
|
||||
|
||||
class WXDLLEXPORT wxSocketEvent : public wxEvent
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxSocketEvent)
|
||||
|
||||
public:
|
||||
wxSocketEvent(int id = 0);
|
||||
wxSocketEvent(int id = 0)
|
||||
: wxEvent(id, wxEVT_SOCKET)
|
||||
{
|
||||
}
|
||||
|
||||
wxSocketNotify GetSocketEvent() const { return m_event; }
|
||||
wxSocketBase *GetSocket() const { return (wxSocketBase *) GetEventObject(); }
|
||||
@ -338,11 +339,13 @@ public:
|
||||
wxSocketBase *Socket() const { return (wxSocketBase *) GetEventObject(); }
|
||||
#endif // WXWIN_COMPATIBILITY_2
|
||||
|
||||
void CopyObject(wxObject& object_dest) const;
|
||||
virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
|
||||
|
||||
public:
|
||||
wxSocketNotify m_event;
|
||||
void *m_clientData;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxSocketEvent)
|
||||
};
|
||||
|
||||
|
||||
|
@ -1235,25 +1235,6 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
|
||||
return (*this);
|
||||
}
|
||||
|
||||
// ==========================================================================
|
||||
// wxSocketEvent
|
||||
// ==========================================================================
|
||||
|
||||
wxSocketEvent::wxSocketEvent(int id) : wxEvent(id)
|
||||
{
|
||||
SetEventType( (wxEventType)wxEVT_SOCKET );
|
||||
}
|
||||
|
||||
void wxSocketEvent::CopyObject(wxObject& object_dest) const
|
||||
{
|
||||
wxSocketEvent *event = (wxSocketEvent *)&object_dest;
|
||||
|
||||
wxEvent::CopyObject(object_dest);
|
||||
|
||||
event->m_event = m_event;
|
||||
event->m_clientData = m_clientData;
|
||||
}
|
||||
|
||||
// ==========================================================================
|
||||
// wxSocketModule
|
||||
// ==========================================================================
|
||||
|
Loading…
Reference in New Issue
Block a user