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

use more wxOVERRIDE (#329)

Browse Source
This commit is contained in:
Maarten
2016-09-25 22:21:28 +02:00
committed by paulcor
parent d0c57dbef0
commit 977a826639
66 changed files with 456 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/custombgwin.h
View File

@@ -29,7 +29,7 @@ public:
virtual ~wxCustomBackgroundWindow() { delete m_backgroundBrush; }
protected:
virtual void DoSetBackgroundBitmap(const wxBitmap& bmp)
virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE
{
delete m_backgroundBrush;
m_backgroundBrush = bmp.IsOk() ? new wxBrush(bmp) : NULL;
@@ -41,7 +41,7 @@ protected:
|| BaseWindowClass::UseBgCol();
}
virtual WXHBRUSH MSWGetCustomBgBrush()
virtual WXHBRUSH MSWGetCustomBgBrush() wxOVERRIDE
{
if ( m_backgroundBrush )
return (WXHBRUSH)m_backgroundBrush->GetResourceHandle();

4
include/wx/msw/ole/activex.h
View File

@@ -165,7 +165,7 @@ public:
void OnPaint(wxPaintEvent&);
void OnSetFocus(wxFocusEvent&);
void OnKillFocus(wxFocusEvent&);
virtual bool MSWTranslateMessage(WXMSG* pMsg);
virtual bool MSWTranslateMessage(WXMSG* pMsg) wxOVERRIDE;
virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc);
protected:
@@ -220,7 +220,7 @@ private:
DISPID m_dispid;
public:
virtual wxEvent *Clone() const
virtual wxEvent *Clone() const wxOVERRIDE
{ return new wxActiveXEvent(*this); }
size_t ParamCount() const;

38
include/wx/msw/ole/dataobj2.h
View File

@@ -33,17 +33,17 @@ public:
}
// implement base class pure virtuals
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);
virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const
void *buf) const wxOVERRIDE
{ return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf)
size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); }
private:
@@ -69,17 +69,17 @@ public:
}
// implement base class pure virtuals
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *buf) const;
virtual bool SetData(size_t len, const void *buf);
virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *buf) const wxOVERRIDE;
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const
void *buf) const wxOVERRIDE
{ return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf)
size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); }
private:
@@ -96,18 +96,18 @@ public:
wxFileDataObject() { }
// implement base class pure virtuals
virtual bool SetData(size_t len, const void *buf);
virtual size_t GetDataSize() const;
virtual bool GetDataHere(void *pData) const;
virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
virtual size_t GetDataSize() const wxOVERRIDE;
virtual bool GetDataHere(void *pData) const wxOVERRIDE;
virtual void AddFile(const wxString& file);
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
{ return GetDataSize(); }
virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
void *buf) const
void *buf) const wxOVERRIDE
{ return GetDataHere(buf); }
virtual bool SetData(const wxDataFormat& WXUNUSED(format),
size_t len, const void *buf)
size_t len, const void *buf) wxOVERRIDE
{ return SetData(len, buf); }
private:
@@ -133,7 +133,7 @@ public:
// override to set m_textFormat
virtual bool SetData(const wxDataFormat& format,
size_t len,
const void *buf);
const void *buf) wxOVERRIDE;
private:
// last data object we got data in

4
include/wx/msw/ole/dropsrc.h
View File

@@ -57,12 +57,12 @@ public:
// do it (call this in response to a mouse button press, for example)
// params: if bAllowMove is false, data can be only copied
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly) wxOVERRIDE;
// overridable: you may give some custom UI feedback during d&d operation
// in this function (it's called on each mouse move, so it shouldn't be
// too slow). Just return false if you want default feedback.
virtual bool GiveFeedback(wxDragResult effect);
virtual bool GiveFeedback(wxDragResult effect) wxOVERRIDE;
protected:
void Init();

4
include/wx/msw/ole/droptgt.h
View File

@@ -44,8 +44,8 @@ public:
void Revoke(WXHWND hwnd);
// provide default implementation for base class pure virtuals
virtual bool OnDrop(wxCoord x, wxCoord y);
virtual bool GetData();
virtual bool OnDrop(wxCoord x, wxCoord y) wxOVERRIDE;
virtual bool GetData() wxOVERRIDE;
// Can only be called during OnXXX methods.
wxDataFormat GetMatchingPair();

36
include/wx/msw/ole/oleutils.h
View File

@@ -124,9 +124,9 @@ private:
#define DECLARE_IUNKNOWN_METHODS \
public: \
STDMETHODIMP QueryInterface(REFIID, void **); \
STDMETHODIMP_(ULONG) AddRef(); \
STDMETHODIMP_(ULONG) Release(); \
STDMETHODIMP QueryInterface(REFIID, void **) wxOVERRIDE; \
STDMETHODIMP_(ULONG) AddRef() wxOVERRIDE; \
STDMETHODIMP_(ULONG) Release() wxOVERRIDE; \
private: \
static const IID *ms_aIids[]; \
wxAutoULong m_cRef
@@ -239,15 +239,15 @@ public:
CURRENCY GetValue() const { return m_value; }
void SetValue(CURRENCY value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const;
virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
#if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const;
virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const wxOVERRIDE;
wxVariantData* Clone() const { return new wxVariantDataCurrency(m_value); }
virtual wxString GetType() const { return wxS("currency"); }
wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataCurrency(m_value); }
virtual wxString GetType() const wxOVERRIDE { return wxS("currency"); }
DECLARE_WXANY_CONVERSION()
@@ -265,15 +265,15 @@ public:
SCODE GetValue() const { return m_value; }
void SetValue(SCODE value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const;
virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
#if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const;
virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const wxOVERRIDE;
wxVariantData* Clone() const { return new wxVariantDataErrorCode(m_value); }
virtual wxString GetType() const { return wxS("errorcode"); }
wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataErrorCode(m_value); }
virtual wxString GetType() const wxOVERRIDE { return wxS("errorcode"); }
DECLARE_WXANY_CONVERSION()
@@ -293,15 +293,15 @@ public:
SAFEARRAY* GetValue() const { return m_value; }
void SetValue(SAFEARRAY* value) { m_value = value; }
virtual bool Eq(wxVariantData& data) const;
virtual bool Eq(wxVariantData& data) const wxOVERRIDE;
#if wxUSE_STD_IOSTREAM
virtual bool Write(wxSTD ostream& str) const;
virtual bool Write(wxSTD ostream& str) const wxOVERRIDE;
#endif
virtual bool Write(wxString& str) const;
virtual bool Write(wxString& str) const wxOVERRIDE;
wxVariantData* Clone() const { return new wxVariantDataSafeArray(m_value); }
virtual wxString GetType() const { return wxS("safearray"); }
wxVariantData* Clone() const wxOVERRIDE { return new wxVariantDataSafeArray(m_value); }
virtual wxString GetType() const wxOVERRIDE { return wxS("safearray"); }
DECLARE_WXANY_CONVERSION()

2
include/wx/msw/private/fswatcher.h
View File

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

8
include/wx/msw/private/pipestream.h
View File

@@ -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;

8
include/wx/msw/private/sockmsw.h
View File

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

8
include/wx/msw/private/textmeasure.h
View File

@@ -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;

6
include/wx/msw/private/timer.h
View File

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

2
include/wx/msw/richmsgdlg.h
View File

@@ -21,7 +21,7 @@ public:
{ }
// overridden base class method showing the native task dialog if possible
virtual int ShowModal();
virtual int ShowModal() wxOVERRIDE;
private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxRichMessageDialog);