use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -49,8 +49,8 @@ class MyApp : public wxApp
|
||||
public:
|
||||
MyApp() { Connect(wxEVT_IDLE, wxIdleEventHandler(MyApp::OnIdle)); }
|
||||
|
||||
virtual bool OnInit();
|
||||
virtual int OnExit();
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual int OnExit() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
void OnIdle(wxIdleEvent& event);
|
||||
@@ -61,11 +61,11 @@ private:
|
||||
class MyConnection : public MyConnectionBase
|
||||
{
|
||||
public:
|
||||
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format);
|
||||
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT);
|
||||
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format);
|
||||
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format);
|
||||
virtual bool OnDisconnect();
|
||||
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
|
||||
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnDisconnect() wxOVERRIDE;
|
||||
};
|
||||
|
||||
class MyClient : public wxClient,
|
||||
@@ -77,10 +77,10 @@ public:
|
||||
|
||||
bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
|
||||
void Disconnect();
|
||||
wxConnectionBase *OnMakeConnection();
|
||||
wxConnectionBase *OnMakeConnection() wxOVERRIDE;
|
||||
bool IsConnected() { return m_connection != NULL; };
|
||||
|
||||
virtual void Notify();
|
||||
virtual void Notify() wxOVERRIDE;
|
||||
|
||||
void StartNextTestIfNecessary();
|
||||
|
||||
|
@@ -45,28 +45,28 @@
|
||||
class MyConnection : public MyConnectionBase, public wxTimer
|
||||
{
|
||||
public:
|
||||
virtual bool Disconnect() { return wxConnection::Disconnect(); }
|
||||
virtual bool Disconnect() wxOVERRIDE { return wxConnection::Disconnect(); }
|
||||
virtual bool OnExecute(const wxString& topic,
|
||||
const void *data,
|
||||
size_t size,
|
||||
wxIPCFormat format);
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
virtual const void *OnRequest(const wxString& topic,
|
||||
const wxString& item,
|
||||
size_t *size,
|
||||
wxIPCFormat format);
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnPoke(const wxString& topic,
|
||||
const wxString& item,
|
||||
const void *data,
|
||||
size_t size,
|
||||
wxIPCFormat format);
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
|
||||
virtual bool DoAdvise(const wxString& item,
|
||||
const void *data,
|
||||
size_t size,
|
||||
wxIPCFormat format);
|
||||
virtual bool OnDisconnect();
|
||||
virtual void Notify();
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnDisconnect() wxOVERRIDE;
|
||||
virtual void Notify() wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxString m_sAdvise;
|
||||
@@ -86,9 +86,9 @@ public:
|
||||
const wxString& item,
|
||||
const void *data,
|
||||
size_t size,
|
||||
wxIPCFormat format);
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
|
||||
wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
// return true if this is the supported topic+item combination, log an
|
||||
@@ -115,7 +115,7 @@ public:
|
||||
void Disconnect();
|
||||
bool IsConnected() { return m_connection != NULL; };
|
||||
|
||||
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
|
||||
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
|
||||
|
||||
private:
|
||||
wxConnection *m_connection;
|
||||
@@ -125,7 +125,7 @@ private:
|
||||
class MyApp : public wxApp
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
MyServer m_server;
|
||||
|
@@ -29,8 +29,8 @@ class MyFrame;
|
||||
class MyApp: public wxApp
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
virtual int OnExit();
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
virtual int OnExit() wxOVERRIDE;
|
||||
MyFrame *GetFrame() { return m_frame; };
|
||||
|
||||
protected:
|
||||
@@ -81,11 +81,11 @@ protected:
|
||||
class MyConnection : public MyConnectionBase
|
||||
{
|
||||
public:
|
||||
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format);
|
||||
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT);
|
||||
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format);
|
||||
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format);
|
||||
virtual bool OnDisconnect();
|
||||
virtual bool DoExecute(const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual const void *Request(const wxString& item, size_t *size = NULL, wxIPCFormat format = wxIPC_TEXT) wxOVERRIDE;
|
||||
virtual bool DoPoke(const wxString& item, const void* data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnAdvise(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnDisconnect() wxOVERRIDE;
|
||||
};
|
||||
|
||||
class MyClient: public wxClient
|
||||
@@ -95,7 +95,7 @@ public:
|
||||
~MyClient();
|
||||
bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
|
||||
void Disconnect();
|
||||
wxConnectionBase *OnMakeConnection();
|
||||
wxConnectionBase *OnMakeConnection() wxOVERRIDE;
|
||||
bool IsConnected() { return m_connection != NULL; };
|
||||
MyConnection *GetConnection() { return m_connection; };
|
||||
|
||||
|
@@ -25,7 +25,7 @@ class MyFrame;
|
||||
class MyApp : public wxApp
|
||||
{
|
||||
public:
|
||||
virtual bool OnInit();
|
||||
virtual bool OnInit() wxOVERRIDE;
|
||||
MyFrame *GetFrame() { return m_frame; }
|
||||
|
||||
protected:
|
||||
@@ -65,13 +65,13 @@ protected:
|
||||
class MyConnection : public MyConnectionBase
|
||||
{
|
||||
public:
|
||||
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format);
|
||||
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format);
|
||||
virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format);
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item);
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item);
|
||||
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format);
|
||||
virtual bool OnDisconnect();
|
||||
virtual bool OnExecute(const wxString& topic, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual const void *OnRequest(const wxString& topic, const wxString& item, size_t *size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnPoke(const wxString& topic, const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnStartAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
|
||||
virtual bool OnStopAdvise(const wxString& topic, const wxString& item) wxOVERRIDE;
|
||||
virtual bool DoAdvise(const wxString& item, const void *data, size_t size, wxIPCFormat format) wxOVERRIDE;
|
||||
virtual bool OnDisconnect() wxOVERRIDE;
|
||||
|
||||
// topic for which we advise the client or empty if none
|
||||
wxString m_advise;
|
||||
@@ -95,7 +95,7 @@ public:
|
||||
void Advise();
|
||||
bool CanAdvise() { return m_connection && !m_connection->m_advise.empty(); }
|
||||
|
||||
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
|
||||
virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
MyConnection *m_connection;
|
||||
|
Reference in New Issue
Block a user