use more wxOVERRIDE (#329)
This commit is contained in:
@@ -309,7 +309,7 @@ protected:
|
||||
const wxFSWatchEntryMSW* watch;
|
||||
};
|
||||
|
||||
virtual ExitCode Entry();
|
||||
virtual ExitCode Entry() wxOVERRIDE;
|
||||
|
||||
// wait for events to occur, read them and send to interested parties
|
||||
// returns false it empty status was read, which means we would exit
|
||||
|
@@ -20,10 +20,10 @@ public:
|
||||
bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
|
||||
|
||||
// returns true if there is any data to be read from the pipe
|
||||
virtual bool CanRead() const;
|
||||
virtual bool CanRead() const wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
virtual size_t OnSysRead(void *buffer, size_t len);
|
||||
virtual size_t OnSysRead(void *buffer, size_t len) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
HANDLE m_hInput;
|
||||
@@ -36,10 +36,10 @@ class wxPipeOutputStream: public wxOutputStream
|
||||
public:
|
||||
explicit wxPipeOutputStream(HANDLE hOutput);
|
||||
virtual ~wxPipeOutputStream() { Close(); }
|
||||
bool Close();
|
||||
bool Close() wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
size_t OnSysWrite(const void *buffer, size_t len);
|
||||
size_t OnSysWrite(const void *buffer, size_t len) wxOVERRIDE;
|
||||
|
||||
protected:
|
||||
HANDLE m_hOutput;
|
||||
|
@@ -36,9 +36,9 @@ public:
|
||||
|
||||
virtual ~wxSocketImplMSW();
|
||||
|
||||
virtual wxSocketError GetLastError() const;
|
||||
virtual wxSocketError GetLastError() const wxOVERRIDE;
|
||||
|
||||
virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags))
|
||||
virtual void ReenableEvents(wxSocketEventFlags WXUNUSED(flags)) wxOVERRIDE
|
||||
{
|
||||
// notifications are never disabled in this implementation, there is no
|
||||
// need for this as WSAAsyncSelect() only sends notification once when
|
||||
@@ -47,9 +47,9 @@ public:
|
||||
}
|
||||
|
||||
private:
|
||||
virtual void DoClose();
|
||||
virtual void DoClose() wxOVERRIDE;
|
||||
|
||||
virtual void UnblockAndRegisterWithEventLoop()
|
||||
virtual void UnblockAndRegisterWithEventLoop() wxOVERRIDE
|
||||
{
|
||||
// no need to make the socket non-blocking, Install_Callback() will do
|
||||
// it
|
||||
|
@@ -34,18 +34,18 @@ public:
|
||||
protected:
|
||||
void Init();
|
||||
|
||||
virtual void BeginMeasuring();
|
||||
virtual void EndMeasuring();
|
||||
virtual void BeginMeasuring() wxOVERRIDE;
|
||||
virtual void EndMeasuring() wxOVERRIDE;
|
||||
|
||||
virtual void DoGetTextExtent(const wxString& string,
|
||||
wxCoord *width,
|
||||
wxCoord *height,
|
||||
wxCoord *descent = NULL,
|
||||
wxCoord *externalLeading = NULL);
|
||||
wxCoord *externalLeading = NULL) wxOVERRIDE;
|
||||
|
||||
virtual bool DoGetPartialTextExtents(const wxString& text,
|
||||
wxArrayInt& widths,
|
||||
double scaleX);
|
||||
double scaleX) wxOVERRIDE;
|
||||
|
||||
|
||||
|
||||
|
@@ -20,10 +20,10 @@ class WXDLLIMPEXP_BASE wxMSWTimerImpl : public wxTimerImpl
|
||||
public:
|
||||
wxMSWTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_id = 0; }
|
||||
|
||||
virtual bool Start(int milliseconds = -1, bool oneShot = false);
|
||||
virtual void Stop();
|
||||
virtual bool Start(int milliseconds = -1, bool oneShot = false) wxOVERRIDE;
|
||||
virtual void Stop() wxOVERRIDE;
|
||||
|
||||
virtual bool IsRunning() const { return m_id != 0; }
|
||||
virtual bool IsRunning() const wxOVERRIDE { return m_id != 0; }
|
||||
|
||||
protected:
|
||||
// this must be 64 bit under Win64 as WPARAM (storing timer ids) is 64 bit
|
||||
|
Reference in New Issue
Block a user