use "new" wx-prefixed macros in samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,7 +100,7 @@ WX_DECLARE_LIST(EventWorker, EList);
|
||||
//and list of two type worker classes that serve clients
|
||||
class Server : public wxApp
|
||||
{
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
public:
|
||||
Server() : m_maxConnections(-1) {}
|
||||
~Server() {}
|
||||
@@ -197,7 +197,7 @@ private:
|
||||
void DoWrite();
|
||||
void DoRead();
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
wxDECLARE_EVENT_TABLE();
|
||||
};
|
||||
|
||||
/******************* Implementation ******************/
|
||||
@@ -473,11 +473,11 @@ void Server::OnTimerEvent(wxTimerEvent&)
|
||||
}
|
||||
|
||||
|
||||
BEGIN_EVENT_TABLE(Server,wxEvtHandler)
|
||||
wxBEGIN_EVENT_TABLE(Server,wxEvtHandler)
|
||||
EVT_SOCKET(wxID_ANY,Server::OnSocketEvent)
|
||||
EVT_WORKER(Server::OnWorkerEvent)
|
||||
EVT_TIMER(wxID_ANY,Server::OnTimerEvent)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
||||
|
||||
ThreadWorker::ThreadWorker(wxSocketBase* pSocket) : wxThread(wxTHREAD_JOINABLE)
|
||||
@@ -759,6 +759,6 @@ void EventWorker::DoWrite()
|
||||
while (!m_socket->Error());
|
||||
}
|
||||
|
||||
BEGIN_EVENT_TABLE(EventWorker,wxEvtHandler)
|
||||
wxBEGIN_EVENT_TABLE(EventWorker,wxEvtHandler)
|
||||
EVT_SOCKET(wxID_ANY,EventWorker::OnSocketEvent)
|
||||
END_EVENT_TABLE()
|
||||
wxEND_EVENT_TABLE()
|
||||
|
Reference in New Issue
Block a user