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

use "new" wx-prefixed macros in samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 07:07:55 +00:00
parent 08a02f640a
commit 5b4a70247c
162 changed files with 698 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/sockets/baseclient.cpp
View File

@@ -71,7 +71,7 @@ WX_DECLARE_LIST(ThreadWorker, TList);
WX_DECLARE_LIST(EventWorker, EList);
class Client : public wxApp {
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
public:
void RemoveEventWorker(EventWorker* p_worker);
private:
@@ -140,7 +140,7 @@ private:
class EventWorker : public wxEvtHandler
{
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
public:
EventWorker(const wxString& p_host, char* p_buf, int p_size);
void Run();
@@ -504,10 +504,10 @@ Client::OnTimerEvent(wxTimerEvent&) {
dumpStatistics();
}
BEGIN_EVENT_TABLE(Client,wxEvtHandler)
wxBEGIN_EVENT_TABLE(Client,wxEvtHandler)
EVT_WORKER(Client::OnWorkerEvent)
EVT_TIMER(wxID_ANY,Client::OnTimerEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
@@ -646,9 +646,9 @@ EventWorker::~EventWorker() {
delete [] m_inbuf;
}
BEGIN_EVENT_TABLE(EventWorker,wxEvtHandler)
wxBEGIN_EVENT_TABLE(EventWorker,wxEvtHandler)
EVT_SOCKET(wxID_ANY,EventWorker::OnSocketEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
ThreadWorker::ThreadWorker(const wxString& p_host, char* p_buf, int p_size)

12
samples/sockets/baseserver.cpp
View File

@@ -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()

6
samples/sockets/client.cpp
View File

@@ -101,7 +101,7 @@ private:
bool m_busy;
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// simple helper class to log start and end of each test
@@ -153,7 +153,7 @@ enum
// event tables and other macros for wxWidgets
// --------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(CLIENT_QUIT, MyFrame::OnQuit)
EVT_MENU(CLIENT_ABOUT, MyFrame::OnAbout)
EVT_MENU(CLIENT_OPEN, MyFrame::OnOpenConnection)
@@ -169,7 +169,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(CLIENT_TESTURL, MyFrame::OnTestURL)
#endif
EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
IMPLEMENT_APP(MyApp)

6
samples/sockets/server.cpp
View File

@@ -90,7 +90,7 @@ private:
int m_numClients;
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
wxDECLARE_EVENT_TABLE();
};
// simple helper class to log start and end of each test
@@ -133,14 +133,14 @@ enum
// event tables and other macros for wxWidgets
// --------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(SERVER_QUIT, MyFrame::OnQuit)
EVT_MENU(SERVER_ABOUT, MyFrame::OnAbout)
EVT_MENU(SERVER_UDPTEST, MyFrame::OnUDPTest)
EVT_MENU(SERVER_WAITFORACCEPT, MyFrame::OnWaitForAccept)
EVT_SOCKET(SERVER_ID, MyFrame::OnServerEvent)
EVT_SOCKET(SOCKET_ID, MyFrame::OnSocketEvent)
END_EVENT_TABLE()
wxEND_EVENT_TABLE()
IMPLEMENT_APP(MyApp)