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

replaced wxSocketEvent::CopyObject() with Clone()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-21 17:25:08 +00:00
parent 0ded6bb695
commit 163f315474
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/socket.h
View File

@@ -323,10 +323,11 @@ public:
class WXDLLEXPORT wxSocketEvent : public wxEvent class WXDLLEXPORT wxSocketEvent : public wxEvent
{ {
DECLARE_DYNAMIC_CLASS(wxSocketEvent)
public: public:
wxSocketEvent(int id = 0); wxSocketEvent(int id = 0)
: wxEvent(id, wxEVT_SOCKET)
{
}
wxSocketNotify GetSocketEvent() const { return m_event; } wxSocketNotify GetSocketEvent() const { return m_event; }
wxSocketBase *GetSocket() const { return (wxSocketBase *) GetEventObject(); } wxSocketBase *GetSocket() const { return (wxSocketBase *) GetEventObject(); }
@@ -338,11 +339,13 @@ public:
wxSocketBase *Socket() const { return (wxSocketBase *) GetEventObject(); } wxSocketBase *Socket() const { return (wxSocketBase *) GetEventObject(); }
#endif // WXWIN_COMPATIBILITY_2 #endif // WXWIN_COMPATIBILITY_2
void CopyObject(wxObject& object_dest) const; virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
public: public:
wxSocketNotify m_event; wxSocketNotify m_event;
void *m_clientData; void *m_clientData;
DECLARE_DYNAMIC_CLASS(wxSocketEvent)
}; };

19
src/common/socket.cpp
View File

@@ -1235,25 +1235,6 @@ wxDatagramSocket& wxDatagramSocket::SendTo( wxSockAddress& addr,
return (*this); 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 // wxSocketModule
// ========================================================================== // ==========================================================================