From 977a8266398a0851a13a640bce90d895d3756a43 Mon Sep 17 00:00:00 2001 From: Maarten Date: Sun, 25 Sep 2016 22:21:28 +0200 Subject: [PATCH] use more wxOVERRIDE (#329) --- include/wx/aui/dockart.h | 24 ++--- include/wx/collpane.h | 4 +- include/wx/compositewin.h | 16 +-- include/wx/containr.h | 12 +-- include/wx/dataobj.h | 18 ++-- include/wx/dcgraph.h | 6 +- include/wx/dialup.h | 2 +- include/wx/display_impl.h | 6 +- include/wx/docview.h | 6 +- include/wx/dvrenderers.h | 22 ++-- include/wx/event.h | 8 +- include/wx/fontmap.h | 4 +- include/wx/generic/animate.h | 14 +-- include/wx/generic/clrpickerg.h | 4 +- include/wx/generic/dvrenderer.h | 14 +-- include/wx/generic/dvrenderers.h | 56 +++++----- include/wx/generic/fontpickerg.h | 6 +- include/wx/generic/hyperlink.h | 22 ++-- include/wx/generic/private/richtooltip.h | 14 +-- include/wx/generic/scrolwin.h | 8 +- include/wx/generic/spinctlg.h | 14 +-- include/wx/glcanvas.h | 2 +- include/wx/html/m_templ.h | 4 +- include/wx/list.h | 3 +- include/wx/mdi.h | 6 +- include/wx/memtext.h | 10 +- include/wx/msw/custombgwin.h | 4 +- include/wx/msw/ole/activex.h | 4 +- include/wx/msw/ole/dataobj2.h | 38 +++---- include/wx/msw/ole/dropsrc.h | 4 +- include/wx/msw/ole/droptgt.h | 4 +- include/wx/msw/ole/oleutils.h | 36 +++---- include/wx/msw/private/fswatcher.h | 2 +- include/wx/msw/private/pipestream.h | 8 +- include/wx/msw/private/sockmsw.h | 8 +- include/wx/msw/private/textmeasure.h | 8 +- include/wx/msw/private/timer.h | 6 +- include/wx/msw/richmsgdlg.h | 2 +- include/wx/nativewin.h | 2 +- include/wx/power.h | 2 +- include/wx/region.h | 10 +- include/wx/renderer.h | 50 ++++----- include/wx/richtext/richtextprint.h | 10 +- include/wx/scrolbar.h | 2 +- include/wx/scrolwin.h | 4 +- include/wx/stc/stc.h | 2 +- include/wx/textcompleter.h | 6 +- include/wx/translation.h | 4 +- include/wx/valnum.h | 10 +- src/common/strconv.cpp | 8 +- src/generic/datavgen.cpp | 38 +++---- src/generic/preferencesg.cpp | 6 +- src/generic/srchctlg.cpp | 2 +- src/generic/tipdlg.cpp | 2 +- src/msw/dialup.cpp | 32 +++--- src/msw/mediactrl_am.cpp | 40 +++---- src/msw/mediactrl_qt.cpp | 40 +++---- src/msw/ole/activex.cpp | 126 +++++++++++------------ src/msw/ole/dataobj.cpp | 32 +++--- src/msw/ole/dropsrc.cpp | 4 +- src/msw/ole/droptgt.cpp | 8 +- src/msw/renderer.cpp | 2 +- src/msw/richtooltip.cpp | 14 +-- src/msw/textctrl.cpp | 20 ++-- src/msw/utilsexc.cpp | 4 +- src/stc/stc.h.in | 2 +- 66 files changed, 456 insertions(+), 455 deletions(-) diff --git a/include/wx/aui/dockart.h b/include/wx/aui/dockart.h index 744cad56c4..2e510be54a 100644 --- a/include/wx/aui/dockart.h +++ b/include/wx/aui/dockart.h @@ -89,45 +89,45 @@ public: wxAuiDefaultDockArt(); - int GetMetric(int metricId); - void SetMetric(int metricId, int newVal); - wxColour GetColour(int id); - void SetColour(int id, const wxColor& colour); - void SetFont(int id, const wxFont& font); - wxFont GetFont(int id); + int GetMetric(int metricId) wxOVERRIDE; + void SetMetric(int metricId, int newVal) wxOVERRIDE; + wxColour GetColour(int id) wxOVERRIDE; + void SetColour(int id, const wxColor& colour) wxOVERRIDE; + void SetFont(int id, const wxFont& font) wxOVERRIDE; + wxFont GetFont(int id) wxOVERRIDE; void DrawSash(wxDC& dc, wxWindow *window, int orientation, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawBackground(wxDC& dc, wxWindow *window, int orientation, - const wxRect& rect); + const wxRect& rect) wxOVERRIDE; void DrawCaption(wxDC& dc, wxWindow *window, const wxString& text, const wxRect& rect, - wxAuiPaneInfo& pane); + wxAuiPaneInfo& pane) wxOVERRIDE; void DrawGripper(wxDC& dc, wxWindow *window, const wxRect& rect, - wxAuiPaneInfo& pane); + wxAuiPaneInfo& pane) wxOVERRIDE; void DrawBorder(wxDC& dc, wxWindow *window, const wxRect& rect, - wxAuiPaneInfo& pane); + wxAuiPaneInfo& pane) wxOVERRIDE; void DrawPaneButton(wxDC& dc, wxWindow *window, int button, int buttonState, const wxRect& rect, - wxAuiPaneInfo& pane); + wxAuiPaneInfo& pane) wxOVERRIDE; void DrawIcon(wxDC& dc, const wxRect& rect, diff --git a/include/wx/collpane.h b/include/wx/collpane.h index 4a66f124f9..54ccd73650 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -41,8 +41,8 @@ public: virtual wxWindow *GetPane() const = 0; - virtual wxString GetLabel() const = 0; - virtual void SetLabel(const wxString& label) = 0; + virtual wxString GetLabel() const wxOVERRIDE = 0; + virtual void SetLabel(const wxString& label) wxOVERRIDE = 0; }; diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h index 0a9bbdff81..b443eaceb5 100644 --- a/include/wx/compositewin.h +++ b/include/wx/compositewin.h @@ -54,7 +54,7 @@ public: // it non-virtually and we need to do this to avoid infinite recursion, // so we work around this by calling the method of this object itself // manually in each function. - virtual bool SetForegroundColour(const wxColour& colour) + virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE { if ( !BaseWindowClass::SetForegroundColour(colour) ) return false; @@ -64,7 +64,7 @@ public: return true; } - virtual bool SetBackgroundColour(const wxColour& colour) + virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE { if ( !BaseWindowClass::SetBackgroundColour(colour) ) return false; @@ -74,7 +74,7 @@ public: return true; } - virtual bool SetFont(const wxFont& font) + virtual bool SetFont(const wxFont& font) wxOVERRIDE { if ( !BaseWindowClass::SetFont(font) ) return false; @@ -84,7 +84,7 @@ public: return true; } - virtual bool SetCursor(const wxCursor& cursor) + virtual bool SetCursor(const wxCursor& cursor) wxOVERRIDE { if ( !BaseWindowClass::SetCursor(cursor) ) return false; @@ -94,7 +94,7 @@ public: return true; } - virtual void SetLayoutDirection(wxLayoutDirection dir) + virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE { BaseWindowClass::SetLayoutDirection(dir); @@ -113,7 +113,7 @@ public: } #if wxUSE_TOOLTIPS - virtual void DoSetToolTipText(const wxString &tip) + virtual void DoSetToolTipText(const wxString &tip) wxOVERRIDE { BaseWindowClass::DoSetToolTipText(tip); @@ -123,7 +123,7 @@ public: SetForAllParts(func, tip); } - virtual void DoSetToolTip(wxToolTip *tip) + virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE { BaseWindowClass::DoSetToolTip(tip); @@ -131,7 +131,7 @@ public: } #endif // wxUSE_TOOLTIPS - virtual void SetFocus() + virtual void SetFocus() wxOVERRIDE { wxSetFocusToChild(this, NULL); } diff --git a/include/wx/containr.h b/include/wx/containr.h index bb25e6a42c..2251a7cd75 100644 --- a/include/wx/containr.h +++ b/include/wx/containr.h @@ -210,22 +210,22 @@ public: #endif // !wxHAS_NATIVE_TAB_TRAVERSAL } - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const wxOVERRIDE { return m_container.AcceptsFocus(); } - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const wxOVERRIDE { return m_container.AcceptsFocusRecursively(); } - WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const + WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE { return m_container.AcceptsFocusFromKeyboard(); } - WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) + WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) wxOVERRIDE { BaseWindowClass::AddChild(child); @@ -238,7 +238,7 @@ public: } } - WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) + WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE { #ifndef wxHAS_NATIVE_TAB_TRAVERSAL m_container.HandleOnWindowDestroy(child); @@ -251,7 +251,7 @@ public: m_container.UpdateCanFocusChildren(); } - WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() + WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() wxOVERRIDE { if ( !m_container.DoSetFocus() ) BaseWindowClass::SetFocus(); diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h index 2caee94243..4b52ffac17 100644 --- a/include/wx/dataobj.h +++ b/include/wx/dataobj.h @@ -290,10 +290,10 @@ public: virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) wxOVERRIDE; #if defined(__WXMSW__) virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, - const wxDataFormat& format ); + const wxDataFormat& format ) wxOVERRIDE; virtual void* SetSizeInBuffer( void* buffer, size_t size, - const wxDataFormat& format ); - virtual size_t GetBufferOffset( const wxDataFormat& format ); + const wxDataFormat& format ) wxOVERRIDE; + virtual size_t GetBufferOffset( const wxDataFormat& format ) wxOVERRIDE; #endif private: @@ -408,19 +408,19 @@ public: bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE; bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) wxOVERRIDE; #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ - 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; // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const + virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE { return GetDataSize(); } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const + virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE { return GetDataHere(buf); } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) + virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE { return SetData(len, buf); } diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h index 817a0e6610..ce26481310 100644 --- a/include/wx/dcgraph.h +++ b/include/wx/dcgraph.h @@ -39,8 +39,8 @@ public: #ifdef __WXMSW__ // override wxDC virtual functions to provide access to HDC associated with // this Graphics object (implemented in src/msw/graphics.cpp) - virtual WXHDC AcquireHDC(); - virtual void ReleaseHDC(WXHDC hdc); + virtual WXHDC AcquireHDC() wxOVERRIDE; + virtual void ReleaseHDC(WXHDC hdc) wxOVERRIDE; #endif // __WXMSW__ private: @@ -204,7 +204,7 @@ public: virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const wxOVERRIDE; #ifdef __WXMSW__ - virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const; + virtual wxRect MSWApplyGDIPlusTransform(const wxRect& r) const wxOVERRIDE; #endif // __WXMSW__ // update the internal clip box variables diff --git a/include/wx/dialup.h b/include/wx/dialup.h index 7688d4a1f8..b682aa226d 100644 --- a/include/wx/dialup.h +++ b/include/wx/dialup.h @@ -176,7 +176,7 @@ public: bool IsOwnEvent() const { return m_id != 0; } // implement the base class pure virtual - virtual wxEvent *Clone() const { return new wxDialUpEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxDialUpEvent(*this); } private: wxDECLARE_NO_ASSIGN_CLASS(wxDialUpEvent); diff --git a/include/wx/display_impl.h b/include/wx/display_impl.h index b6674ebfad..40b4827885 100644 --- a/include/wx/display_impl.h +++ b/include/wx/display_impl.h @@ -100,9 +100,9 @@ protected: class WXDLLIMPEXP_CORE wxDisplayFactorySingle : public wxDisplayFactory { public: - virtual wxDisplayImpl *CreateDisplay(unsigned n); - virtual unsigned GetCount() { return 1; } - virtual int GetFromPoint(const wxPoint& pt); + virtual wxDisplayImpl *CreateDisplay(unsigned n) wxOVERRIDE; + virtual unsigned GetCount() wxOVERRIDE { return 1; } + virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; }; #endif // _WX_DISPLAY_IMPL_H_BASE_ diff --git a/include/wx/docview.h b/include/wx/docview.h index 45cfc585c9..46c415aef0 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -717,7 +717,7 @@ public: return true; } - virtual bool Destroy() + virtual bool Destroy() wxOVERRIDE { // FIXME: why exactly do we do this? to avoid activation events during // destructions maybe? @@ -727,7 +727,7 @@ public: protected: // hook the child view into event handlers chain here - virtual bool TryBefore(wxEvent& event) + virtual bool TryBefore(wxEvent& event) wxOVERRIDE { return TryProcessEvent(event) || BaseClass::TryBefore(event); } @@ -882,7 +882,7 @@ public: protected: // hook the document manager into event handling chain here - virtual bool TryBefore(wxEvent& event) + virtual bool TryBefore(wxEvent& event) wxOVERRIDE { // It is important to send the event to the base class first as // wxMDIParentFrame overrides its TryBefore() to send the menu events diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h index 69ed7817d7..f65adedc9b 100644 --- a/include/wx/dvrenderers.h +++ b/include/wx/dvrenderers.h @@ -400,13 +400,13 @@ public: wxDataViewChoiceRenderer( const wxArrayString &choices, wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool HasEditorCtrl() const { return true; } - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); - virtual bool Render( wxRect rect, wxDC *dc, int state ); - virtual wxSize GetSize() const; - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; + virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; + virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; wxString GetChoice(size_t index) const { return m_choices[index]; } const wxArrayString& GetChoices() const { return m_choices; } @@ -427,11 +427,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); + virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; }; diff --git a/include/wx/event.h b/include/wx/event.h index c70f159f6e..44d378ac01 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -356,7 +356,7 @@ public: CheckHandlerArgument(static_cast(NULL)); } - virtual void operator()(wxEvtHandler *handler, wxEvent& event) + virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE { Class * realHandler = m_handler; if ( !realHandler ) @@ -373,7 +373,7 @@ public: (realHandler->*m_method)(static_cast(event)); } - virtual bool IsMatching(const wxEventFunctor& functor) const + virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE { if ( wxTypeId(functor) != wxTypeId(*this) ) return false; @@ -388,10 +388,10 @@ public: (m_handler == other.m_handler || other.m_handler == NULL); } - virtual wxEvtHandler *GetEvtHandler() const + virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE { return this->ConvertToEvtHandler(m_handler); } - virtual wxEventFunction GetEvtMethod() const + virtual wxEventFunction GetEvtMethod() const wxOVERRIDE { return this->ConvertToEvtMethod(m_method); } private: diff --git a/include/wx/fontmap.h b/include/wx/fontmap.h index c640daa83f..26883deeec 100644 --- a/include/wx/fontmap.h +++ b/include/wx/fontmap.h @@ -202,7 +202,7 @@ public: // returns the encoding for the given charset (in the form of RFC 2046) or // wxFONTENCODING_SYSTEM if couldn't decode it virtual wxFontEncoding CharsetToEncoding(const wxString& charset, - bool interactive = true); + bool interactive = true) wxOVERRIDE; // find an alternative for the given encoding (which is supposed to not be // available on this system). If successful, return true and fill info @@ -242,7 +242,7 @@ public: static wxFontMapper *Get(); // pseudo-RTTI since we aren't a wxObject. - virtual bool IsDummy() { return false; } + virtual bool IsDummy() wxOVERRIDE { return false; } protected: // GetAltForEncoding() helper: tests for the existence of the given diff --git a/include/wx/generic/animate.h b/include/wx/generic/animate.h index c9773f44fb..80157f59fa 100644 --- a/include/wx/generic/animate.h +++ b/include/wx/generic/animate.h @@ -26,18 +26,18 @@ public: wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) { LoadFile(name, type); } - virtual bool IsOk() const + virtual bool IsOk() const wxOVERRIDE { return m_refData != NULL; } - virtual unsigned int GetFrameCount() const; - virtual int GetDelay(unsigned int i) const; - virtual wxImage GetFrame(unsigned int i) const; - virtual wxSize GetSize() const; + virtual unsigned int GetFrameCount() const wxOVERRIDE; + virtual int GetDelay(unsigned int i) const wxOVERRIDE; + virtual wxImage GetFrame(unsigned int i) const wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; virtual bool LoadFile(const wxString& filename, - wxAnimationType type = wxANIMATION_TYPE_ANY); + wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; virtual bool Load(wxInputStream& stream, - wxAnimationType type = wxANIMATION_TYPE_ANY); + wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE; // extended interface used by the generic implementation of wxAnimationCtrl wxPoint GetFramePosition(unsigned int frame) const; diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index fd12c0e637..84076816c0 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -65,9 +65,9 @@ public: protected: wxBitmap m_bitmap; - wxSize DoGetBestSize() const; + wxSize DoGetBestSize() const wxOVERRIDE; - void UpdateColour(); + void UpdateColour() wxOVERRIDE; // the colour data shown in wxColourPickerCtrlGeneric // controls. This member is static so that all colour pickers diff --git a/include/wx/generic/dvrenderer.h b/include/wx/generic/dvrenderer.h index 251dc81297..c60238406e 100644 --- a/include/wx/generic/dvrenderer.h +++ b/include/wx/generic/dvrenderer.h @@ -23,19 +23,19 @@ public: int align = wxDVR_DEFAULT_ALIGNMENT ); virtual ~wxDataViewRenderer(); - virtual wxDC *GetDC(); + virtual wxDC *GetDC() wxOVERRIDE; - virtual void SetAlignment( int align ); - virtual int GetAlignment() const; + virtual void SetAlignment( int align ) wxOVERRIDE; + virtual int GetAlignment() const wxOVERRIDE; - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) + virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE) wxOVERRIDE { m_ellipsizeMode = mode; } - virtual wxEllipsizeMode GetEllipsizeMode() const + virtual wxEllipsizeMode GetEllipsizeMode() const wxOVERRIDE { return m_ellipsizeMode; } - virtual void SetMode( wxDataViewCellMode mode ) + virtual void SetMode( wxDataViewCellMode mode ) wxOVERRIDE { m_mode = mode; } - virtual wxDataViewCellMode GetMode() const + virtual wxDataViewCellMode GetMode() const wxOVERRIDE { return m_mode; } // implementation diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h index 3e7f6825af..d7d2b60c15 100644 --- a/include/wx/generic/dvrenderers.h +++ b/include/wx/generic/dvrenderers.h @@ -31,7 +31,7 @@ public: wxDataViewModel *model, const wxDataViewItem& item, unsigned int col, - const wxMouseEvent *mouseEvent) + const wxMouseEvent *mouseEvent) wxOVERRIDE { return ActivateCell(cell, model, item, col, mouseEvent); } @@ -59,17 +59,17 @@ public: void EnableMarkup(bool enable = true); #endif // wxUSE_MARKUP - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - virtual bool Render(wxRect cell, wxDC *dc, int state); - virtual wxSize GetSize() const; + virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; // in-place editing - virtual bool HasEditorCtrl() const; + virtual bool HasEditorCtrl() const wxOVERRIDE; virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); + const wxVariant &value ) wxOVERRIDE; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; protected: wxString m_text; @@ -95,11 +95,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; + virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; private: wxIcon m_icon; @@ -122,18 +122,18 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; + virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; // Implementation only, don't use nor override virtual bool WXActivateCell(const wxRect& cell, wxDataViewModel *model, const wxDataViewItem& item, unsigned int col, - const wxMouseEvent *mouseEvent); + const wxMouseEvent *mouseEvent) wxOVERRIDE; private: bool m_toggle; @@ -155,11 +155,11 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant& value ) const; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant& value ) const wxOVERRIDE; - virtual bool Render(wxRect cell, wxDC *dc, int state); - virtual wxSize GetSize() const; + virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; private: wxString m_label; @@ -182,16 +182,16 @@ public: wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; + virtual bool SetValue( const wxVariant &value ) wxOVERRIDE; + virtual bool GetValue( wxVariant &value ) const wxOVERRIDE; - virtual bool Render(wxRect cell, wxDC *dc, int state); - virtual wxSize GetSize() const; + virtual bool Render(wxRect cell, wxDC *dc, int state) wxOVERRIDE; + virtual wxSize GetSize() const wxOVERRIDE; - virtual bool HasEditorCtrl() const { return true; } + virtual bool HasEditorCtrl() const wxOVERRIDE { return true; } virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, - const wxVariant &value ); - virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ); + const wxVariant &value ) wxOVERRIDE; + virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE; private: wxDataViewIconText m_value; diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h index ea2180ed35..04662c64d5 100644 --- a/include/wx/generic/fontpickerg.h +++ b/include/wx/generic/fontpickerg.h @@ -35,10 +35,10 @@ public: Create(parent, id, initial, pos, size, style, validator, name); } - virtual wxColour GetSelectedColour() const + virtual wxColour GetSelectedColour() const wxOVERRIDE { return m_data.GetColour(); } - virtual void SetSelectedColour(const wxColour &colour) + virtual void SetSelectedColour(const wxColour &colour) wxOVERRIDE { m_data.SetColour(colour); UpdateFont(); } virtual ~wxGenericFontButton() {} @@ -69,7 +69,7 @@ public: protected: - void UpdateFont(); + void UpdateFont() wxOVERRIDE; wxFontData m_data; diff --git a/include/wx/generic/hyperlink.h b/include/wx/generic/hyperlink.h index eb73388869..df452db301 100644 --- a/include/wx/generic/hyperlink.h +++ b/include/wx/generic/hyperlink.h @@ -45,20 +45,20 @@ public: // get/set - wxColour GetHoverColour() const { return m_hoverColour; } - void SetHoverColour(const wxColour &colour) { m_hoverColour = colour; } + wxColour GetHoverColour() const wxOVERRIDE { return m_hoverColour; } + void SetHoverColour(const wxColour &colour) wxOVERRIDE { m_hoverColour = colour; } - wxColour GetNormalColour() const { return m_normalColour; } - void SetNormalColour(const wxColour &colour); + wxColour GetNormalColour() const wxOVERRIDE { return m_normalColour; } + void SetNormalColour(const wxColour &colour) wxOVERRIDE; - wxColour GetVisitedColour() const { return m_visitedColour; } - void SetVisitedColour(const wxColour &colour); + wxColour GetVisitedColour() const wxOVERRIDE { return m_visitedColour; } + void SetVisitedColour(const wxColour &colour) wxOVERRIDE; - wxString GetURL() const { return m_url; } - void SetURL (const wxString &url) { m_url=url; } + wxString GetURL() const wxOVERRIDE { return m_url; } + void SetURL (const wxString &url) wxOVERRIDE { m_url=url; } - void SetVisited(bool visited = true) { m_visited=visited; } - bool GetVisited() const { return m_visited; } + void SetVisited(bool visited = true) wxOVERRIDE { m_visited=visited; } + bool GetVisited() const wxOVERRIDE { return m_visited; } // NOTE: also wxWindow::Set/GetLabel, wxWindow::Set/GetBackgroundColour, // wxWindow::Get/SetFont, wxWindow::Get/SetCursor are important ! @@ -110,7 +110,7 @@ protected: // Returns the best size for the window, which is the size needed // to display the text label. - virtual wxSize DoGetBestClientSize() const; + virtual wxSize DoGetBestClientSize() const wxOVERRIDE; // creates a context menu with "Copy URL" menuitem virtual void DoContextMenu(const wxPoint &); diff --git a/include/wx/generic/private/richtooltip.h b/include/wx/generic/private/richtooltip.h index ad356f51f8..97baf1e59e 100644 --- a/include/wx/generic/private/richtooltip.h +++ b/include/wx/generic/private/richtooltip.h @@ -33,15 +33,15 @@ public: } virtual void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd); - virtual void SetCustomIcon(const wxIcon& icon); - virtual void SetStandardIcon(int icon); + const wxColour& colEnd) wxOVERRIDE; + virtual void SetCustomIcon(const wxIcon& icon) wxOVERRIDE; + virtual void SetStandardIcon(int icon) wxOVERRIDE; virtual void SetTimeout(unsigned milliseconds, - unsigned millisecondsDelay = 0); - virtual void SetTipKind(wxTipKind tipKind); - virtual void SetTitleFont(const wxFont& font); + unsigned millisecondsDelay = 0) wxOVERRIDE; + virtual void SetTipKind(wxTipKind tipKind) wxOVERRIDE; + virtual void SetTitleFont(const wxFont& font) wxOVERRIDE; - virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL); + virtual void ShowFor(wxWindow* win, const wxRect* rect = NULL) wxOVERRIDE; protected: wxString m_title, diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index efcbd0445e..4ea57253f1 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -22,13 +22,13 @@ public: wxScrollHelper(wxWindow *winToScroll); // implement base class pure virtuals - virtual void AdjustScrollbars(); - virtual bool IsScrollbarShown(int orient) const; + virtual void AdjustScrollbars() wxOVERRIDE; + virtual bool IsScrollbarShown(int orient) const wxOVERRIDE; protected: - virtual void DoScroll(int x, int y); + virtual void DoScroll(int x, int y) wxOVERRIDE; virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert); + wxScrollbarVisibility vert) wxOVERRIDE; private: // helper of AdjustScrollbars(): does the work for the single scrollbar diff --git a/include/wx/generic/spinctlg.h b/include/wx/generic/spinctlg.h index b8c1c73a22..5651c81ee9 100644 --- a/include/wx/generic/spinctlg.h +++ b/include/wx/generic/spinctlg.h @@ -111,7 +111,7 @@ protected: #ifdef __WXMSW__ // and, for MSW, enabling this window itself - virtual void DoEnable(bool enable); + virtual void DoEnable(bool enable) wxOVERRIDE; #endif // __WXMSW__ enum SendEvent @@ -393,7 +393,7 @@ public: unsigned GetDigits() const { return m_digits; } // operations - void SetValue(const wxString& value) + void SetValue(const wxString& value) wxOVERRIDE { wxSpinCtrlGenericBase::SetValue(value); } void SetValue(double value) { DoSetValue(value, SendEvent_None); } void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } @@ -402,14 +402,14 @@ public: // We don't implement bases support for floating point numbers, this is not // very useful in practice. - virtual int GetBase() const { return 10; } - virtual bool SetBase(int WXUNUSED(base)) { return 0; } + virtual int GetBase() const wxOVERRIDE { return 10; } + virtual bool SetBase(int WXUNUSED(base)) wxOVERRIDE { return 0; } protected: - virtual void DoSendEvent(); + virtual void DoSendEvent() wxOVERRIDE; - virtual bool DoTextToValue(const wxString& text, double *val); - virtual wxString DoValueToText(double val); + virtual bool DoTextToValue(const wxString& text, double *val) wxOVERRIDE; + virtual wxString DoValueToText(double val) wxOVERRIDE; unsigned m_digits; diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h index 545040d4bc..de8d5019b7 100644 --- a/include/wx/glcanvas.h +++ b/include/wx/glcanvas.h @@ -339,7 +339,7 @@ class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase public: wxGLApp() : wxGLAppBase() { } - virtual bool InitGLVisual(const int *attribList); + virtual bool InitGLVisual(const int *attribList) wxOVERRIDE; private: wxDECLARE_DYNAMIC_CLASS(wxGLApp); diff --git a/include/wx/html/m_templ.h b/include/wx/html/m_templ.h index 41d0416d4b..121078f350 100644 --- a/include/wx/html/m_templ.h +++ b/include/wx/html/m_templ.h @@ -31,7 +31,7 @@ I STRONGLY recommend reading and understanding these macros!! class wxHTML_Handler_##name : public wxHtmlWinTagHandler \ { \ public: \ - wxString GetSupportedTags() {return wxT(tags);} + wxString GetSupportedTags() wxOVERRIDE {return wxT(tags);} @@ -45,7 +45,7 @@ I STRONGLY recommend reading and understanding these macros!! #define TAG_HANDLER_PROC(varib) \ public: \ - bool HandleTag(const wxHtmlTag& varib) + bool HandleTag(const wxHtmlTag& varib) wxOVERRIDE diff --git a/include/wx/list.h b/include/wx/list.h index 4644c22c3b..427c0392f6 100644 --- a/include/wx/list.h +++ b/include/wx/list.h @@ -652,7 +652,7 @@ private: { wxNodeBase::SetData(data); } \ \ protected: \ - virtual void DeleteData(); \ + virtual void DeleteData() wxOVERRIDE; \ \ wxDECLARE_NO_COPY_CLASS(nodetype); \ }; \ @@ -742,6 +742,7 @@ private: virtual wxNodeBase *CreateNode(wxNodeBase *prev, wxNodeBase *next, \ void *data, \ const wxListKey& key = wxDefaultListKey) \ + wxOVERRIDE \ { \ return new nodetype(this, \ (nodetype *)prev, (nodetype *)next, \ diff --git a/include/wx/mdi.h b/include/wx/mdi.h index 4be67abda9..8bf2cd698c 100644 --- a/include/wx/mdi.h +++ b/include/wx/mdi.h @@ -279,17 +279,17 @@ public: // extra platform-specific hacks #ifdef __WXMSW__ - virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const wxOVERRIDE { return wxWindow::MSWGetStyle(flags, exstyle); } - virtual WXHWND MSWGetParent() const + virtual WXHWND MSWGetParent() const wxOVERRIDE { return wxWindow::MSWGetParent(); } - WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) + WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE { return wxWindow::MSWWindowProc(message, wParam, lParam); } diff --git a/include/wx/memtext.h b/include/wx/memtext.h index 475e8fdc23..86ff7760d0 100644 --- a/include/wx/memtext.h +++ b/include/wx/memtext.h @@ -27,21 +27,21 @@ public: wxMemoryText(const wxString& name) : wxTextBuffer(name) { } protected: - virtual bool OnExists() const + virtual bool OnExists() const wxOVERRIDE { return false; } virtual bool OnOpen(const wxString & WXUNUSED(strBufferName), - wxTextBufferOpenMode WXUNUSED(OpenMode)) + wxTextBufferOpenMode WXUNUSED(OpenMode)) wxOVERRIDE { return true; } - virtual bool OnClose() + virtual bool OnClose() wxOVERRIDE { return true; } - virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) + virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) wxOVERRIDE { return true; } virtual bool OnWrite(wxTextFileType WXUNUSED(typeNew), - const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) + const wxMBConv& WXUNUSED(conv) = wxMBConvUTF8()) wxOVERRIDE { return true; } private: diff --git a/include/wx/msw/custombgwin.h b/include/wx/msw/custombgwin.h index ca8d8bfc42..027e2b77f5 100644 --- a/include/wx/msw/custombgwin.h +++ b/include/wx/msw/custombgwin.h @@ -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(); diff --git a/include/wx/msw/ole/activex.h b/include/wx/msw/ole/activex.h index 1679d8dffd..1518671eb8 100644 --- a/include/wx/msw/ole/activex.h +++ b/include/wx/msw/ole/activex.h @@ -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; diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h index 9b97e9fb0a..3f881c6db1 100644 --- a/include/wx/msw/ole/dataobj2.h +++ b/include/wx/msw/ole/dataobj2.h @@ -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 diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h index 1c5f692702..3fcfe9bc94 100644 --- a/include/wx/msw/ole/dropsrc.h +++ b/include/wx/msw/ole/dropsrc.h @@ -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(); diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h index 4cb9d3907d..2602e05ddd 100644 --- a/include/wx/msw/ole/droptgt.h +++ b/include/wx/msw/ole/droptgt.h @@ -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(); diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h index befb693189..f8707df516 100644 --- a/include/wx/msw/ole/oleutils.h +++ b/include/wx/msw/ole/oleutils.h @@ -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() diff --git a/include/wx/msw/private/fswatcher.h b/include/wx/msw/private/fswatcher.h index 055617b77c..7bf034f018 100644 --- a/include/wx/msw/private/fswatcher.h +++ b/include/wx/msw/private/fswatcher.h @@ -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 diff --git a/include/wx/msw/private/pipestream.h b/include/wx/msw/private/pipestream.h index 23df2b8943..b163ae4267 100644 --- a/include/wx/msw/private/pipestream.h +++ b/include/wx/msw/private/pipestream.h @@ -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; diff --git a/include/wx/msw/private/sockmsw.h b/include/wx/msw/private/sockmsw.h index fdde2f7017..5c4e565d20 100644 --- a/include/wx/msw/private/sockmsw.h +++ b/include/wx/msw/private/sockmsw.h @@ -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 diff --git a/include/wx/msw/private/textmeasure.h b/include/wx/msw/private/textmeasure.h index 2c890a9fad..5ac95e29fb 100644 --- a/include/wx/msw/private/textmeasure.h +++ b/include/wx/msw/private/textmeasure.h @@ -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; diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h index 71ce2ceec7..db1da306d3 100644 --- a/include/wx/msw/private/timer.h +++ b/include/wx/msw/private/timer.h @@ -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 diff --git a/include/wx/msw/richmsgdlg.h b/include/wx/msw/richmsgdlg.h index 51cdc63222..a1fb60e808 100644 --- a/include/wx/msw/richmsgdlg.h +++ b/include/wx/msw/richmsgdlg.h @@ -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); diff --git a/include/wx/nativewin.h b/include/wx/nativewin.h index b2ebad0685..bf585d5796 100644 --- a/include/wx/nativewin.h +++ b/include/wx/nativewin.h @@ -238,7 +238,7 @@ public: protected: #ifdef __WXMSW__ virtual WXLRESULT - MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE; #endif // __WXMSW__ private: diff --git a/include/wx/power.h b/include/wx/power.h index 7c45abafb6..7de0b207f7 100644 --- a/include/wx/power.h +++ b/include/wx/power.h @@ -64,7 +64,7 @@ public: // default copy ctor, assignment operator and dtor are ok - virtual wxEvent *Clone() const { return new wxPowerEvent(*this); } + virtual wxEvent *Clone() const wxOVERRIDE { return new wxPowerEvent(*this); } private: bool m_veto; diff --git a/include/wx/region.h b/include/wx/region.h index 1ee8fcb1f4..7db620b49d 100644 --- a/include/wx/region.h +++ b/include/wx/region.h @@ -201,11 +201,11 @@ protected: virtual bool DoCombine(const wxRegion& region, wxRegionOp op) = 0; // implement some wxRegionBase pure virtuals in terms of Combine() - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); + virtual bool DoUnionWithRect(const wxRect& rect) wxOVERRIDE; + virtual bool DoUnionWithRegion(const wxRegion& region) wxOVERRIDE; + virtual bool DoIntersect(const wxRegion& region) wxOVERRIDE; + virtual bool DoSubtract(const wxRegion& region) wxOVERRIDE; + virtual bool DoXor(const wxRegion& region) wxOVERRIDE; }; #endif // ports with wxRegion::Combine() diff --git a/include/wx/renderer.h b/include/wx/renderer.h index 627c142e12..fd67b7a760 100644 --- a/include/wx/renderer.h +++ b/include/wx/renderer.h @@ -418,7 +418,7 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) + wxHeaderButtonParams* params = NULL) wxOVERRIDE { return m_rendererNative.DrawHeaderButton(win, dc, rect, flags, sortArrow, params); } virtual int DrawHeaderButtonContents(wxWindow *win, @@ -426,25 +426,25 @@ public: const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, - wxHeaderButtonParams* params = NULL) + wxHeaderButtonParams* params = NULL) wxOVERRIDE { return m_rendererNative.DrawHeaderButtonContents(win, dc, rect, flags, sortArrow, params); } - virtual int GetHeaderButtonHeight(wxWindow *win) + virtual int GetHeaderButtonHeight(wxWindow *win) wxOVERRIDE { return m_rendererNative.GetHeaderButtonHeight(win); } - virtual int GetHeaderButtonMargin(wxWindow *win) + virtual int GetHeaderButtonMargin(wxWindow *win) wxOVERRIDE { return m_rendererNative.GetHeaderButtonMargin(win); } virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawTreeItemButton(win, dc, rect, flags); } virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawSplitterBorder(win, dc, rect, flags); } virtual void DrawSplitterSash(wxWindow *win, @@ -452,80 +452,80 @@ public: const wxSize& size, wxCoord position, wxOrientation orient, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawSplitterSash(win, dc, size, position, orient, flags); } virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawComboBoxDropButton(win, dc, rect, flags); } virtual void DrawDropArrow(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawDropArrow(win, dc, rect, flags); } virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawCheckBox( win, dc, rect, flags ); } - virtual wxSize GetCheckBoxSize(wxWindow *win) + virtual wxSize GetCheckBoxSize(wxWindow *win) wxOVERRIDE { return m_rendererNative.GetCheckBoxSize(win); } virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawPushButton( win, dc, rect, flags ); } virtual void DrawCollapseButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawCollapseButton(win, dc, rect, flags); } - virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) + virtual wxSize GetCollapseButtonSize(wxWindow *win, wxDC& dc) wxOVERRIDE { return m_rendererNative.GetCollapseButtonSize(win, dc); } virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawItemSelectionRect( win, dc, rect, flags ); } virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawFocusRect( win, dc, rect, flags ); } virtual void DrawChoice(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawChoice( win, dc, rect, flags); } virtual void DrawComboBox(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawComboBox( win, dc, rect, flags); } virtual void DrawTextCtrl(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawTextCtrl( win, dc, rect, flags); } virtual void DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawRadioBitmap(win, dc, rect, flags); } #ifdef wxHAS_DRAW_TITLE_BAR_BITMAP @@ -533,7 +533,7 @@ public: wxDC& dc, const wxRect& rect, wxTitleBarButton button, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawTitleBarBitmap(win, dc, rect, button, flags); } #endif // wxHAS_DRAW_TITLE_BAR_BITMAP @@ -542,7 +542,7 @@ public: const wxRect& rect, int value, int max, - int flags = 0) + int flags = 0) wxOVERRIDE { m_rendererNative.DrawGauge(win, dc, rect, value, max, flags); } virtual void DrawItemText(wxWindow* win, @@ -551,13 +551,13 @@ public: const wxRect& rect, int align = wxALIGN_LEFT | wxALIGN_TOP, int flags = 0, - wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) + wxEllipsizeMode ellipsizeMode = wxELLIPSIZE_END) wxOVERRIDE { m_rendererNative.DrawItemText(win, dc, text, rect, align, flags, ellipsizeMode); } - virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) wxOVERRIDE { return m_rendererNative.GetSplitterParams(win); } - virtual wxRendererVersion GetVersion() const + virtual wxRendererVersion GetVersion() const wxOVERRIDE { return m_rendererNative.GetVersion(); } protected: diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h index bff09ec5e3..1776d47020 100644 --- a/include/wx/richtext/richtextprint.h +++ b/include/wx/richtext/richtextprint.h @@ -124,11 +124,11 @@ public: void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect); // wxPrintout virtual functions - virtual bool OnPrintPage(int page); - virtual bool HasPage(int page); - virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo); - virtual bool OnBeginDocument(int startPage, int endPage); - virtual void OnPreparePrinting(); + virtual bool OnPrintPage(int page) wxOVERRIDE; + virtual bool HasPage(int page) wxOVERRIDE; + virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo) wxOVERRIDE; + virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE; + virtual void OnPreparePrinting() wxOVERRIDE; private: diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index 1352ae6c61..7ab55524b0 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -53,7 +53,7 @@ public: virtual void SetThumbPosition(int viewStart) = 0; virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize, - bool refresh = true) = 0; + bool refresh = true) wxOVERRIDE = 0; // implementation-only bool IsNeeded() const { return GetRange() > GetThumbSize(); } diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index 3c4a870aca..e904ed3922 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -431,13 +431,13 @@ public: #ifdef __WXMSW__ // we need to return a special WM_GETDLGCODE value to process just the // arrows but let the other navigation characters through - virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE { return FilterMSWWindowProc(nMsg, T::MSWWindowProc(nMsg, wParam, lParam)); } // Take into account the scroll origin. - virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const + virtual void MSWAdjustBrushOrg(int* xOrg, int* yOrg) const wxOVERRIDE { CalcUnscrolledPosition(*xOrg, *yOrg, xOrg, yOrg); } diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index a2e4dac114..49c16d0d38 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -5356,7 +5356,7 @@ public: bool GetControl() const; bool GetAlt() const; - virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } + virtual wxEvent* Clone() const wxOVERRIDE { return new wxStyledTextEvent(*this); } #ifndef SWIG private: diff --git a/include/wx/textcompleter.h b/include/wx/textcompleter.h index bc4135f8bf..cb21e913db 100644 --- a/include/wx/textcompleter.h +++ b/include/wx/textcompleter.h @@ -44,8 +44,8 @@ public: // Must be implemented to return all the completions for the given prefix. virtual void GetCompletions(const wxString& prefix, wxArrayString& res) = 0; - virtual bool Start(const wxString& prefix); - virtual wxString GetNext(); + virtual bool Start(const wxString& prefix) wxOVERRIDE; + virtual wxString GetNext() wxOVERRIDE; private: wxArrayString m_completions; @@ -72,7 +72,7 @@ public: } virtual void GetCompletions(const wxString& WXUNUSED(prefix), - wxArrayString& res) + wxArrayString& res) wxOVERRIDE { res = m_strings; } diff --git a/include/wx/translation.h b/include/wx/translation.h index 95e293c2f6..a85c2a1612 100644 --- a/include/wx/translation.h +++ b/include/wx/translation.h @@ -227,9 +227,9 @@ class WXDLLIMPEXP_BASE wxResourceTranslationsLoader { public: virtual wxMsgCatalog *LoadCatalog(const wxString& domain, - const wxString& lang); + const wxString& lang) wxOVERRIDE; - virtual wxArrayString GetAvailableTranslations(const wxString& domain) const; + virtual wxArrayString GetAvailableTranslations(const wxString& domain) const wxOVERRIDE; protected: // returns resource type to use for translations diff --git a/include/wx/valnum.h b/include/wx/valnum.h index 3e73a730f2..0d7892085f 100644 --- a/include/wx/valnum.h +++ b/include/wx/valnum.h @@ -157,7 +157,7 @@ public: SetMax(max); } - virtual bool TransferToWindow() + virtual bool TransferToWindow() wxOVERRIDE { if ( m_value ) { @@ -171,7 +171,7 @@ public: return true; } - virtual bool TransferFromWindow() + virtual bool TransferFromWindow() wxOVERRIDE { if ( m_value ) { @@ -204,7 +204,7 @@ protected: // Implement wxNumValidatorBase virtual method which is the same for // both integer and floating point numbers. - virtual wxString NormalizeString(const wxString& s) const + virtual wxString NormalizeString(const wxString& s) const wxOVERRIDE { LongestValueType value; return BaseValidator::FromString(s, &value) ? NormalizeValue(value) @@ -312,7 +312,7 @@ public: this->DoSetMax(std::numeric_limits::max()); } - virtual wxObject *Clone() const { return new wxIntegerValidator(*this); } + virtual wxObject *Clone() const wxOVERRIDE { return new wxIntegerValidator(*this); } private: wxDECLARE_NO_ASSIGN_CLASS(wxIntegerValidator); @@ -417,7 +417,7 @@ public: this->SetPrecision(precision); } - virtual wxObject *Clone() const + virtual wxObject *Clone() const wxOVERRIDE { return new wxFloatingPointValidator(*this); } diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 480d16251a..3f0cd2caeb 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -2569,7 +2569,7 @@ public: } #endif // wxUSE_FONTMAP - virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const + virtual size_t MB2WC(wchar_t *buf, const char *psz, size_t n) const wxOVERRIDE { // note that we have to use MB_ERR_INVALID_CHARS flag as it without it // the behaviour is not compatible with the Unix version (using iconv) @@ -2608,7 +2608,7 @@ public: return len - 1; } - virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const + virtual size_t WC2MB(char *buf, const wchar_t *pwz, size_t n) const wxOVERRIDE { /* We need to WC_NO_BEST_FIT_CHARS to prevent WideCharToMultiByte() @@ -2693,7 +2693,7 @@ public: return len - 1; } - virtual size_t GetMBNulLen() const + virtual size_t GetMBNulLen() const wxOVERRIDE { if ( m_minMBCharWidth == 0 ) { @@ -2732,7 +2732,7 @@ public: return m_minMBCharWidth; } - virtual wxMBConv *Clone() const { return new wxMBConv_win32(*this); } + virtual wxMBConv *Clone() const wxOVERRIDE { return new wxMBConv_win32(*this); } bool IsOk() const { return m_CodePage != -1; } diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp index 24d8a36010..860de73a4f 100644 --- a/src/generic/datavgen.cpp +++ b/src/generic/datavgen.cpp @@ -273,12 +273,12 @@ public: protected: // implement/override wxHeaderCtrl functions by forwarding them to the main // control - virtual const wxHeaderColumn& GetColumn(unsigned int idx) const + virtual const wxHeaderColumn& GetColumn(unsigned int idx) const wxOVERRIDE { return *(GetOwner()->GetColumn(idx)); } - virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) + virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle) wxOVERRIDE { wxDataViewCtrl * const owner = GetOwner(); @@ -402,7 +402,7 @@ private: public: wxDataViewRenameTimer( wxDataViewMainWindow *owner ); - void Notify(); + void Notify() wxOVERRIDE; }; //----------------------------------------------------------------------------- @@ -648,7 +648,7 @@ public: // Override the base class method to resort if needed, i.e. if // SortPrepare() was called -- and ignored -- while we were frozen. - virtual void DoThaw() + virtual void DoThaw() wxOVERRIDE { if ( m_sortColumn == SortColumn_OnThaw ) { @@ -716,11 +716,11 @@ public: void UpdateDisplay(); void RecalculateDisplay(); - void OnInternalIdle(); + void OnInternalIdle() wxOVERRIDE; void OnRenameTimer(); - void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ); + void ScrollWindow( int dx, int dy, const wxRect *rect = NULL ) wxOVERRIDE; void ScrollTo( int rows, int column ); unsigned GetCurrentRow() const { return m_currentRow; } @@ -921,17 +921,17 @@ public: wxGenericDataViewModelNotifier( wxDataViewMainWindow *mainWindow ) { m_mainWindow = mainWindow; } - virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) + virtual bool ItemAdded( const wxDataViewItem & parent, const wxDataViewItem & item ) wxOVERRIDE { return m_mainWindow->ItemAdded( parent , item ); } - virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) + virtual bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item ) wxOVERRIDE { return m_mainWindow->ItemDeleted( parent, item ); } - virtual bool ItemChanged( const wxDataViewItem & item ) + virtual bool ItemChanged( const wxDataViewItem & item ) wxOVERRIDE { return m_mainWindow->ItemChanged(item); } - virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) + virtual bool ValueChanged( const wxDataViewItem & item , unsigned int col ) wxOVERRIDE { return m_mainWindow->ValueChanged( item, col ); } - virtual bool Cleared() + virtual bool Cleared() wxOVERRIDE { return m_mainWindow->Cleared(); } - virtual void Resort() + virtual void Resort() wxOVERRIDE { m_mainWindow->Resort(); } wxDataViewMainWindow *m_mainWindow; @@ -1417,7 +1417,7 @@ public: delete m_hint; } - virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) + virtual bool GiveFeedback( wxDragResult WXUNUSED(effect) ) wxOVERRIDE { wxPoint pos = wxGetMousePosition(); @@ -1468,7 +1468,7 @@ public: m_win = win; } - virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) + virtual wxDragResult OnDragOver( wxCoord x, wxCoord y, wxDragResult def ) wxOVERRIDE { wxDataFormat format = GetMatchingPair(); if (format == wxDF_INVALID) @@ -1476,7 +1476,7 @@ public: return m_win->OnDragOver( format, x, y, def); } - virtual bool OnDrop( wxCoord x, wxCoord y ) + virtual bool OnDrop( wxCoord x, wxCoord y ) wxOVERRIDE { wxDataFormat format = GetMatchingPair(); if (format == wxDF_INVALID) @@ -1484,7 +1484,7 @@ public: return m_win->OnDrop( format, x, y ); } - virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) + virtual wxDragResult OnData( wxCoord x, wxCoord y, wxDragResult def ) wxOVERRIDE { wxDataFormat format = GetMatchingPair(); if (format == wxDF_INVALID) @@ -1494,7 +1494,7 @@ public: return m_win->OnData( format, x, y, def ); } - virtual void OnLeave() + virtual void OnLeave() wxOVERRIDE { m_win->OnLeave(); } wxDataViewMainWindow *m_win; @@ -3071,7 +3071,7 @@ public: parent = node; } - virtual int operator() ( wxDataViewTreeNode * node ) + virtual int operator() ( wxDataViewTreeNode * node ) wxOVERRIDE { current ++; if( current == static_cast(row)) @@ -3456,7 +3456,7 @@ public: } // Maybe binary search will help to speed up this process - virtual int operator() ( wxDataViewTreeNode * node) + virtual int operator() ( wxDataViewTreeNode * node) wxOVERRIDE { ret ++; if( node->GetItem() == item ) diff --git a/src/generic/preferencesg.cpp b/src/generic/preferencesg.cpp index fc6fc0cc34..dd0e47123a 100644 --- a/src/generic/preferencesg.cpp +++ b/src/generic/preferencesg.cpp @@ -97,7 +97,7 @@ public: m_title = title; } - virtual void AddPage(wxPreferencesPage* page) + virtual void AddPage(wxPreferencesPage* page) wxOVERRIDE { m_pages.push_back(wxSharedPtr(page)); } @@ -204,7 +204,7 @@ public: m_currentPage = -1; } - virtual void Show(wxWindow* parent) + virtual void Show(wxWindow* parent) wxOVERRIDE { wxScopedPtr dlg(CreateDialog(parent)); @@ -222,7 +222,7 @@ public: m_currentPage = dlg->GetSelectedPage(); } - virtual void Dismiss() + virtual void Dismiss() wxOVERRIDE { if ( m_dlg ) { diff --git a/src/generic/srchctlg.cpp b/src/generic/srchctlg.cpp index 8a1137405f..a6f939e3b8 100644 --- a/src/generic/srchctlg.cpp +++ b/src/generic/srchctlg.cpp @@ -120,7 +120,7 @@ protected: // to do this easily and as there is much in that code I don't understand // (notably what is the logic for buttons sizing?) I prefer to not touch it // at all. - virtual wxSize DoGetBestSize() const + virtual wxSize DoGetBestSize() const wxOVERRIDE { const long flags = GetWindowStyleFlag(); wxSearchTextCtrl* const self = const_cast(this); diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index aaece5895c..028a374de6 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -78,7 +78,7 @@ class WXDLLIMPEXP_ADV wxRegTipProvider : public wxTipProvider public: wxRegTipProvider(const wxString& keyname); - virtual wxString GetTip(); + virtual wxString GetTip() wxOVERRIDE; }; // Empty implementation for now to keep the linker happy diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index 61988328a9..6337b847ed 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -166,23 +166,23 @@ public: virtual ~wxDialUpManagerMSW(); // implement base class pure virtuals - virtual bool IsOk() const; - virtual size_t GetISPNames(wxArrayString& names) const; + virtual bool IsOk() const wxOVERRIDE; + virtual size_t GetISPNames(wxArrayString& names) const wxOVERRIDE; virtual bool Dial(const wxString& nameOfISP, const wxString& username, const wxString& password, - bool async); - virtual bool IsDialing() const; - virtual bool CancelDialing(); - virtual bool HangUp(); - virtual bool IsAlwaysOnline() const; - virtual bool IsOnline() const; - virtual void SetOnlineStatus(bool isOnline = true); - virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds); - virtual void DisableAutoCheckOnlineStatus(); - virtual void SetWellKnownHost(const wxString& hostname, int port); + bool async) wxOVERRIDE; + virtual bool IsDialing() const wxOVERRIDE; + virtual bool CancelDialing() wxOVERRIDE; + virtual bool HangUp() wxOVERRIDE; + virtual bool IsAlwaysOnline() const wxOVERRIDE; + virtual bool IsOnline() const wxOVERRIDE; + virtual void SetOnlineStatus(bool isOnline = true) wxOVERRIDE; + virtual bool EnableAutoCheckOnlineStatus(size_t nSeconds) wxOVERRIDE; + virtual void DisableAutoCheckOnlineStatus() wxOVERRIDE; + virtual void SetWellKnownHost(const wxString& hostname, int port) wxOVERRIDE; virtual void SetConnectCommand(const wxString& commandDial, - const wxString& commandHangup); + const wxString& commandHangup) wxOVERRIDE; // for RasTimer void CheckRasStatus(); @@ -220,7 +220,7 @@ private: RasTimer(wxDialUpManagerMSW *dialUpManager) { m_dialUpManager = dialUpManager; } - virtual void Notify() { m_dialUpManager->CheckRasStatus(); } + virtual void Notify() wxOVERRIDE { m_dialUpManager->CheckRasStatus(); } private: wxDialUpManagerMSW *m_dialUpManager; @@ -283,8 +283,8 @@ private: class wxDialUpManagerModule : public wxModule { public: - bool OnInit() { return true; } - void OnExit() + bool OnInit() wxOVERRIDE { return true; } + void OnExit() wxOVERRIDE { HWND hwnd = wxDialUpManagerMSW::GetRasWindow(); if ( hwnd ) diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp index 4721bb1455..a47cd851bb 100644 --- a/src/msw/mediactrl_am.cpp +++ b/src/msw/mediactrl_am.cpp @@ -839,44 +839,44 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name); + const wxString& name) wxOVERRIDE; - virtual bool Play(); - virtual bool Pause(); - virtual bool Stop(); + virtual bool Play() wxOVERRIDE; + virtual bool Pause() wxOVERRIDE; + virtual bool Stop() wxOVERRIDE; - virtual bool Load(const wxString& fileName); - virtual bool Load(const wxURI& location); - virtual bool Load(const wxURI& location, const wxURI& proxy); + virtual bool Load(const wxString& fileName) wxOVERRIDE; + virtual bool Load(const wxURI& location) wxOVERRIDE; + virtual bool Load(const wxURI& location, const wxURI& proxy) wxOVERRIDE; bool DoLoad(const wxString& location); void FinishLoad(); - virtual wxMediaState GetState(); + virtual wxMediaState GetState() wxOVERRIDE; - virtual bool SetPosition(wxLongLong where); - virtual wxLongLong GetPosition(); - virtual wxLongLong GetDuration(); + virtual bool SetPosition(wxLongLong where) wxOVERRIDE; + virtual wxLongLong GetPosition() wxOVERRIDE; + virtual wxLongLong GetDuration() wxOVERRIDE; - virtual void Move(int x, int y, int w, int h); - wxSize GetVideoSize() const; + virtual void Move(int x, int y, int w, int h) wxOVERRIDE; + wxSize GetVideoSize() const wxOVERRIDE; - virtual double GetPlaybackRate(); - virtual bool SetPlaybackRate(double); + virtual double GetPlaybackRate() wxOVERRIDE; + virtual bool SetPlaybackRate(double) wxOVERRIDE; - virtual double GetVolume(); - virtual bool SetVolume(double); + virtual double GetVolume() wxOVERRIDE; + virtual bool SetVolume(double) wxOVERRIDE; - virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags); + virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE; void DoGetDownloadProgress(wxLongLong*, wxLongLong*); - virtual wxLongLong GetDownloadProgress() + virtual wxLongLong GetDownloadProgress() wxOVERRIDE { wxLongLong progress, total; DoGetDownloadProgress(&progress, &total); return progress; } - virtual wxLongLong GetDownloadTotal() + virtual wxLongLong GetDownloadTotal() wxOVERRIDE { wxLongLong progress, total; DoGetDownloadProgress(&progress, &total); diff --git a/src/msw/mediactrl_qt.cpp b/src/msw/mediactrl_qt.cpp index 9e30fc2856..e2087e7ba4 100644 --- a/src/msw/mediactrl_qt.cpp +++ b/src/msw/mediactrl_qt.cpp @@ -355,33 +355,33 @@ public: const wxSize& size, long style, const wxValidator& validator, - const wxString& name); + const wxString& name) wxOVERRIDE; - virtual bool Play(); - virtual bool Pause(); - virtual bool Stop(); + virtual bool Play() wxOVERRIDE; + virtual bool Pause() wxOVERRIDE; + virtual bool Stop() wxOVERRIDE; virtual bool Load(const wxURI& location, - const wxURI& proxy) + const wxURI& proxy) wxOVERRIDE { return wxMediaBackend::Load(location, proxy); } - virtual bool Load(const wxString& fileName); - virtual bool Load(const wxURI& location); + virtual bool Load(const wxString& fileName) wxOVERRIDE; + virtual bool Load(const wxURI& location) wxOVERRIDE; - virtual wxMediaState GetState(); + virtual wxMediaState GetState() wxOVERRIDE; - virtual bool SetPosition(wxLongLong where); - virtual wxLongLong GetPosition(); - virtual wxLongLong GetDuration(); + virtual bool SetPosition(wxLongLong where) wxOVERRIDE; + virtual wxLongLong GetPosition() wxOVERRIDE; + virtual wxLongLong GetDuration() wxOVERRIDE; - virtual void Move(int x, int y, int w, int h); - wxSize GetVideoSize() const; + virtual void Move(int x, int y, int w, int h) wxOVERRIDE; + wxSize GetVideoSize() const wxOVERRIDE; - virtual double GetPlaybackRate(); - virtual bool SetPlaybackRate(double dRate); + virtual double GetPlaybackRate() wxOVERRIDE; + virtual bool SetPlaybackRate(double dRate) wxOVERRIDE; - virtual double GetVolume(); - virtual bool SetVolume(double); + virtual double GetVolume() wxOVERRIDE; + virtual bool SetVolume(double) wxOVERRIDE; void Cleanup(); void FinishLoad(); @@ -394,7 +394,7 @@ public: static LRESULT CALLBACK QTWndProc(HWND, UINT, WPARAM, LPARAM); - virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags); + virtual bool ShowPlayerControls(wxMediaCtrlPlayerControls flags) wxOVERRIDE; wxSize m_bestSize; // Original movie size Movie m_movie; // QT Movie handle/instance @@ -469,7 +469,7 @@ public: wxQTLoadTimer(Movie movie, wxQTMediaBackend* parent, wxQuickTimeLibrary* pLib) : m_movie(movie), m_parent(parent), m_pLib(pLib) {} - void Notify() + void Notify() wxOVERRIDE { m_pLib->MoviesTask(m_movie, 0); // kMovieLoadStatePlayable @@ -502,7 +502,7 @@ public: wxQuickTimeLibrary* pLib) : m_movie(movie), m_parent(parent), m_pLib(pLib) {} - void Notify() + void Notify() wxOVERRIDE { // // OK, a little explaining - basically originally diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp index f90b33ddff..9fd00b1133 100644 --- a/src/msw/ole/activex.cpp +++ b/src/msw/ole/activex.cpp @@ -59,9 +59,9 @@ wxDEFINE_EVENT( wxEVT_ACTIVEX, wxActiveXEvent ); static void _GetInterface(cls *self, REFIID iid, void **_interface, const char *&desc);\ public:\ LONG GetRefCount();\ - HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject);\ - ULONG STDMETHODCALLTYPE AddRef();\ - ULONG STDMETHODCALLTYPE Release();\ + HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void ** ppvObject) wxOVERRIDE;\ + ULONG STDMETHODCALLTYPE AddRef() wxOVERRIDE;\ + ULONG STDMETHODCALLTYPE Release() wxOVERRIDE;\ ULONG STDMETHODCALLTYPE AddLock();\ ULONG STDMETHODCALLTYPE ReleaseLock() @@ -228,16 +228,16 @@ public: //***************************IDispatch***************************** HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID, OLECHAR ** , unsigned int , LCID , - DISPID * ) + DISPID * ) wxOVERRIDE { return E_NOTIMPL; } - STDMETHOD(GetTypeInfo)(unsigned int, LCID, ITypeInfo **) + STDMETHOD(GetTypeInfo)(unsigned int, LCID, ITypeInfo **) wxOVERRIDE { return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE GetTypeInfoCount(unsigned int *) + HRESULT STDMETHODCALLTYPE GetTypeInfoCount(unsigned int *) wxOVERRIDE { return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID, LCID, WORD wFlags, DISPPARAMS *, VARIANT * pVarResult, EXCEPINFO *, - unsigned int *) + unsigned int *) wxOVERRIDE { if (!(wFlags & DISPATCH_PROPERTYGET)) return S_OK; @@ -309,32 +309,32 @@ public: } //**************************IOleWindow*************************** - HRESULT STDMETHODCALLTYPE GetWindow(HWND * phwnd) + HRESULT STDMETHODCALLTYPE GetWindow(HWND * phwnd) wxOVERRIDE { if (phwnd == NULL) return E_INVALIDARG; (*phwnd) = m_hWndParent; return S_OK; } - HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) + HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL) wxOVERRIDE {return S_OK;} //**************************IOleInPlaceUIWindow***************** - HRESULT STDMETHODCALLTYPE GetBorder(LPRECT lprectBorder) + HRESULT STDMETHODCALLTYPE GetBorder(LPRECT lprectBorder) wxOVERRIDE { if (lprectBorder == NULL) return E_INVALIDARG; return INPLACE_E_NOTOOLSPACE; } - HRESULT STDMETHODCALLTYPE RequestBorderSpace(LPCBORDERWIDTHS pborderwidths) + HRESULT STDMETHODCALLTYPE RequestBorderSpace(LPCBORDERWIDTHS pborderwidths) wxOVERRIDE { if (pborderwidths == NULL) return E_INVALIDARG; return INPLACE_E_NOTOOLSPACE; } - HRESULT STDMETHODCALLTYPE SetBorderSpace(LPCBORDERWIDTHS) + HRESULT STDMETHODCALLTYPE SetBorderSpace(LPCBORDERWIDTHS) wxOVERRIDE {return S_OK;} HRESULT STDMETHODCALLTYPE SetActiveObject( - IOleInPlaceActiveObject *pActiveObject, LPCOLESTR) + IOleInPlaceActiveObject *pActiveObject, LPCOLESTR) wxOVERRIDE { if (pActiveObject) pActiveObject->AddRef(); @@ -345,12 +345,12 @@ public: //********************IOleInPlaceFrame************************ - STDMETHOD(InsertMenus)(HMENU, LPOLEMENUGROUPWIDTHS){return S_OK;} - STDMETHOD(SetMenu)(HMENU, HOLEMENU, HWND){ return S_OK;} - STDMETHOD(RemoveMenus)(HMENU){return S_OK;} - STDMETHOD(SetStatusText)(LPCOLESTR){ return S_OK;} - HRESULT STDMETHODCALLTYPE EnableModeless(BOOL){return S_OK;} - HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) + STDMETHOD(InsertMenus)(HMENU, LPOLEMENUGROUPWIDTHS) wxOVERRIDE {return S_OK;} + STDMETHOD(SetMenu)(HMENU, HOLEMENU, HWND) wxOVERRIDE {return S_OK;} + STDMETHOD(RemoveMenus)(HMENU) wxOVERRIDE {return S_OK;} + STDMETHOD(SetStatusText)(LPCOLESTR) wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE EnableModeless(BOOL) wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG lpmsg, WORD) wxOVERRIDE { // TODO: send an event with this id if (m_window->m_oleInPlaceActiveObject.IsOk()) @@ -359,16 +359,16 @@ public: } //*******************IOleInPlaceSite************************** - HRESULT STDMETHODCALLTYPE CanInPlaceActivate(){return S_OK;} - HRESULT STDMETHODCALLTYPE OnInPlaceActivate() + HRESULT STDMETHODCALLTYPE CanInPlaceActivate() wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE OnInPlaceActivate() wxOVERRIDE { m_bInPlaceActive = true; return S_OK; } - HRESULT STDMETHODCALLTYPE OnUIActivate() + HRESULT STDMETHODCALLTYPE OnUIActivate() wxOVERRIDE { m_bUIActive = true; return S_OK; } HRESULT STDMETHODCALLTYPE GetWindowContext(IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc, LPRECT lprcPosRect, LPRECT lprcClipRect, - LPOLEINPLACEFRAMEINFO lpFrameInfo) + LPOLEINPLACEFRAMEINFO lpFrameInfo) wxOVERRIDE { if (ppFrame == NULL || ppDoc == NULL || lprcPosRect == NULL || lprcClipRect == NULL || lpFrameInfo == NULL) @@ -415,14 +415,14 @@ public: return S_OK; } - HRESULT STDMETHODCALLTYPE Scroll(SIZE){return S_OK;} - HRESULT STDMETHODCALLTYPE OnUIDeactivate(BOOL) + HRESULT STDMETHODCALLTYPE Scroll(SIZE) wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE OnUIDeactivate(BOOL) wxOVERRIDE { m_bUIActive = false; return S_OK; } - HRESULT STDMETHODCALLTYPE OnInPlaceDeactivate() + HRESULT STDMETHODCALLTYPE OnInPlaceDeactivate() wxOVERRIDE { m_bInPlaceActive = false; return S_OK; } - HRESULT STDMETHODCALLTYPE DiscardUndoState(){return S_OK;} - HRESULT STDMETHODCALLTYPE DeactivateAndUndo(){return S_OK; } - HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) + HRESULT STDMETHODCALLTYPE DiscardUndoState() wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE DeactivateAndUndo() wxOVERRIDE {return S_OK; } + HRESULT STDMETHODCALLTYPE OnPosRectChange(LPCRECT lprcPosRect) wxOVERRIDE { if (m_window->m_oleInPlaceObject.IsOk() && lprcPosRect) { @@ -442,7 +442,7 @@ public: return S_OK; } //*************************IOleInPlaceSiteEx*********************** - HRESULT STDMETHODCALLTYPE OnInPlaceActivateEx(BOOL * pfNoRedraw, DWORD) + HRESULT STDMETHODCALLTYPE OnInPlaceActivateEx(BOOL * pfNoRedraw, DWORD) wxOVERRIDE { OleLockRunning(m_window->m_ActiveX, TRUE, FALSE); if (pfNoRedraw) @@ -450,14 +450,14 @@ public: return S_OK; } - HRESULT STDMETHODCALLTYPE OnInPlaceDeactivateEx(BOOL) + HRESULT STDMETHODCALLTYPE OnInPlaceDeactivateEx(BOOL) wxOVERRIDE { OleLockRunning(m_window->m_ActiveX, FALSE, FALSE); return S_OK; } - STDMETHOD(RequestUIActivate)(){ return S_OK;} + STDMETHOD(RequestUIActivate)() wxOVERRIDE { return S_OK;} //*************************IOleClientSite************************** - HRESULT STDMETHODCALLTYPE SaveObject(){return S_OK;} + HRESULT STDMETHODCALLTYPE SaveObject() wxOVERRIDE {return S_OK;} const char *OleGetMonikerToStr(DWORD dwAssign) { switch (dwAssign) @@ -480,8 +480,8 @@ public: default : return "Bad Enum"; } } - STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **){return E_FAIL;} - HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer) + STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **) wxOVERRIDE {return E_FAIL;} + HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer) wxOVERRIDE { if (ppContainer == NULL) return E_INVALIDARG; @@ -490,20 +490,20 @@ public: wxASSERT(SUCCEEDED(hr)); return hr; } - HRESULT STDMETHODCALLTYPE ShowObject() + HRESULT STDMETHODCALLTYPE ShowObject() wxOVERRIDE { if (m_window->m_oleObjectHWND) ::ShowWindow(m_window->m_oleObjectHWND, SW_SHOW); return S_OK; } - STDMETHOD(OnShowWindow)(BOOL){return S_OK;} - STDMETHOD(RequestNewObjectLayout)(){return E_NOTIMPL;} + STDMETHOD(OnShowWindow)(BOOL) wxOVERRIDE {return S_OK;} + STDMETHOD(RequestNewObjectLayout)() wxOVERRIDE {return E_NOTIMPL;} //********************IParseDisplayName*************************** HRESULT STDMETHODCALLTYPE ParseDisplayName( - IBindCtx *, LPOLESTR, ULONG *, IMoniker **){return E_NOTIMPL;} + IBindCtx *, LPOLESTR, ULONG *, IMoniker **) wxOVERRIDE {return E_NOTIMPL;} //********************IOleContainer******************************* - STDMETHOD(EnumObjects)(DWORD, IEnumUnknown **){return E_NOTIMPL;} - HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;} + STDMETHOD(EnumObjects)(DWORD, IEnumUnknown **) wxOVERRIDE {return E_NOTIMPL;} + HRESULT STDMETHODCALLTYPE LockContainer(BOOL) wxOVERRIDE {return S_OK;} //********************IOleItemContainer*************************** HRESULT STDMETHODCALLTYPE #if defined(_UNICODE) @@ -511,7 +511,7 @@ public: #else GetObjectA #endif - (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject) + (LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject) wxOVERRIDE { if (pszItem == NULL || ppvObject == NULL) return E_INVALIDARG; @@ -519,43 +519,43 @@ public: return MK_E_NOOBJECT; } HRESULT STDMETHODCALLTYPE GetObjectStorage( - LPOLESTR pszItem, IBindCtx * , REFIID, void ** ppvStorage) + LPOLESTR pszItem, IBindCtx * , REFIID, void ** ppvStorage) wxOVERRIDE { if (pszItem == NULL || ppvStorage == NULL) return E_INVALIDARG; *ppvStorage = NULL; return MK_E_NOOBJECT; } - HRESULT STDMETHODCALLTYPE IsRunning(LPOLESTR pszItem) + HRESULT STDMETHODCALLTYPE IsRunning(LPOLESTR pszItem) wxOVERRIDE { if (pszItem == NULL) return E_INVALIDARG; return MK_E_NOOBJECT; } //***********************IOleControlSite***************************** - HRESULT STDMETHODCALLTYPE OnControlInfoChanged() + HRESULT STDMETHODCALLTYPE OnControlInfoChanged() wxOVERRIDE {return S_OK;} - HRESULT STDMETHODCALLTYPE LockInPlaceActive(BOOL fLock) + HRESULT STDMETHODCALLTYPE LockInPlaceActive(BOOL fLock) wxOVERRIDE { m_bInPlaceLocked = (fLock) ? true : false; return S_OK; } - HRESULT STDMETHODCALLTYPE GetExtendedControl(IDispatch **) + HRESULT STDMETHODCALLTYPE GetExtendedControl(IDispatch **) wxOVERRIDE {return E_NOTIMPL;} HRESULT STDMETHODCALLTYPE TransformCoords( - POINTL * pPtlHimetric, POINTF * pPtfContainer, DWORD) + POINTL * pPtlHimetric, POINTF * pPtfContainer, DWORD) wxOVERRIDE { if (pPtlHimetric == NULL || pPtfContainer == NULL) return E_INVALIDARG; return E_NOTIMPL; } - HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG, DWORD) + HRESULT STDMETHODCALLTYPE TranslateAccelerator(LPMSG, DWORD) wxOVERRIDE {return E_NOTIMPL;} - HRESULT STDMETHODCALLTYPE OnFocus(BOOL){return S_OK;} - HRESULT STDMETHODCALLTYPE ShowPropertyFrame(){return E_NOTIMPL;} + HRESULT STDMETHODCALLTYPE OnFocus(BOOL) wxOVERRIDE {return S_OK;} + HRESULT STDMETHODCALLTYPE ShowPropertyFrame() wxOVERRIDE {return E_NOTIMPL;} //**************************IOleCommandTarget*********************** HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *, ULONG cCmds, - OLECMD prgCmds[], OLECMDTEXT *) + OLECMD prgCmds[], OLECMDTEXT *) wxOVERRIDE { if (prgCmds == NULL) return E_INVALIDARG; for (ULONG nCmd = 0; nCmd < cCmds; nCmd++) @@ -567,19 +567,19 @@ public: } HRESULT STDMETHODCALLTYPE Exec(const GUID *, DWORD, - DWORD, VARIANTARG *, VARIANTARG *) + DWORD, VARIANTARG *, VARIANTARG *) wxOVERRIDE {return OLECMDERR_E_NOTSUPPORTED;} //**********************IAdviseSink************************************ - void STDMETHODCALLTYPE OnDataChange(FORMATETC *, STGMEDIUM *) {} - void STDMETHODCALLTYPE OnViewChange(DWORD, LONG) {} - void STDMETHODCALLTYPE OnRename(IMoniker *){} - void STDMETHODCALLTYPE OnSave(){} - void STDMETHODCALLTYPE OnClose(){} + void STDMETHODCALLTYPE OnDataChange(FORMATETC *, STGMEDIUM *) wxOVERRIDE {} + void STDMETHODCALLTYPE OnViewChange(DWORD, LONG) wxOVERRIDE {} + void STDMETHODCALLTYPE OnRename(IMoniker *) wxOVERRIDE {} + void STDMETHODCALLTYPE OnSave() wxOVERRIDE {} + void STDMETHODCALLTYPE OnClose() wxOVERRIDE {} //**********************IOleDocumentSite*************************** HRESULT STDMETHODCALLTYPE ActivateMe( - IOleDocumentView __RPC_FAR *pViewToActivate) + IOleDocumentView __RPC_FAR *pViewToActivate) wxOVERRIDE { wxAutoIOleInPlaceSite inPlaceSite( IID_IOleInPlaceSite, (IDispatch *) this); @@ -690,17 +690,17 @@ public: } // IDispatch - STDMETHODIMP GetIDsOfNames(REFIID, OLECHAR**, unsigned int, LCID, DISPID*) + STDMETHODIMP GetIDsOfNames(REFIID, OLECHAR**, unsigned int, LCID, DISPID*) wxOVERRIDE { return E_NOTIMPL; } - STDMETHODIMP GetTypeInfo(unsigned int, LCID, ITypeInfo**) + STDMETHODIMP GetTypeInfo(unsigned int, LCID, ITypeInfo**) wxOVERRIDE { return E_NOTIMPL; } - STDMETHODIMP GetTypeInfoCount(unsigned int*) + STDMETHODIMP GetTypeInfoCount(unsigned int*) wxOVERRIDE { return E_NOTIMPL; } @@ -710,7 +710,7 @@ public: LCID lcid, WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult, EXCEPINFO * pExcepInfo, - unsigned int * puArgErr) + unsigned int * puArgErr) wxOVERRIDE { if (wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT | DISPATCH_PROPERTYPUTREF)) return E_NOTIMPL; diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index fbc5362ac8..8ed8893c79 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -167,10 +167,10 @@ public: virtual ~wxIEnumFORMATETC() { delete [] m_formats; } // IEnumFORMATETC - STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched); - STDMETHODIMP Skip(ULONG celt); - STDMETHODIMP Reset(); - STDMETHODIMP Clone(IEnumFORMATETC **ppenum); + STDMETHODIMP Next(ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) wxOVERRIDE; + STDMETHODIMP Skip(ULONG celt) wxOVERRIDE; + STDMETHODIMP Reset() wxOVERRIDE; + STDMETHODIMP Clone(IEnumFORMATETC **ppenum) wxOVERRIDE; DECLARE_IUNKNOWN_METHODS; @@ -198,15 +198,15 @@ public: void SetDeleteFlag() { m_mustDelete = true; } // IDataObject - STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium); - STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium); - STDMETHODIMP QueryGetData(FORMATETC *pformatetc); - STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *In, FORMATETC *pOut); - STDMETHODIMP SetData(FORMATETC *pfetc, STGMEDIUM *pmedium, BOOL fRelease); - STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumFEtc); - STDMETHODIMP DAdvise(FORMATETC *pfetc, DWORD ad, IAdviseSink *p, DWORD *pdw); - STDMETHODIMP DUnadvise(DWORD dwConnection); - STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise); + STDMETHODIMP GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmedium) wxOVERRIDE; + STDMETHODIMP GetDataHere(FORMATETC *pformatetc, STGMEDIUM *pmedium) wxOVERRIDE; + STDMETHODIMP QueryGetData(FORMATETC *pformatetc) wxOVERRIDE; + STDMETHODIMP GetCanonicalFormatEtc(FORMATETC *In, FORMATETC *pOut) wxOVERRIDE; + STDMETHODIMP SetData(FORMATETC *pfetc, STGMEDIUM *pmedium, BOOL fRelease) wxOVERRIDE; + STDMETHODIMP EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppenumFEtc) wxOVERRIDE; + STDMETHODIMP DAdvise(FORMATETC *pfetc, DWORD ad, IAdviseSink *p, DWORD *pdw) wxOVERRIDE; + STDMETHODIMP DUnadvise(DWORD dwConnection) wxOVERRIDE; + STDMETHODIMP EnumDAdvise(IEnumSTATDATA **ppenumAdvise) wxOVERRIDE; DECLARE_IUNKNOWN_METHODS; @@ -1376,13 +1376,13 @@ class CFSTR_SHELLURLDataObject : public wxCustomDataObject public: CFSTR_SHELLURLDataObject() : wxCustomDataObject(CFSTR_SHELLURL) {} - virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) + virtual size_t GetBufferOffset( const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE { return 0; } virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size, - const wxDataFormat& WXUNUSED(format) ) + const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE { // CFSTR_SHELLURL is _always_ ANSI text *size = strlen( (const char*)buffer ); @@ -1391,7 +1391,7 @@ public: } virtual void* SetSizeInBuffer( void* buffer, size_t WXUNUSED(size), - const wxDataFormat& WXUNUSED(format) ) + const wxDataFormat& WXUNUSED(format) ) wxOVERRIDE { return buffer; } diff --git a/src/msw/ole/dropsrc.cpp b/src/msw/ole/dropsrc.cpp index e5b556d2ca..9e2842d2c5 100644 --- a/src/msw/ole/dropsrc.cpp +++ b/src/msw/ole/dropsrc.cpp @@ -49,8 +49,8 @@ public: virtual ~wxIDropSource() { } // IDropSource - STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState); - STDMETHODIMP GiveFeedback(DWORD dwEffect); + STDMETHODIMP QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) wxOVERRIDE; + STDMETHODIMP GiveFeedback(DWORD dwEffect) wxOVERRIDE; DECLARE_IUNKNOWN_METHODS; diff --git a/src/msw/ole/droptgt.cpp b/src/msw/ole/droptgt.cpp index 237ab42c91..eb5685f5bf 100644 --- a/src/msw/ole/droptgt.cpp +++ b/src/msw/ole/droptgt.cpp @@ -81,10 +81,10 @@ public: void SetHwnd(HWND hwnd) { m_hwnd = hwnd; } // IDropTarget methods - STDMETHODIMP DragEnter(LPDATAOBJECT, DWORD, POINTL, LPDWORD); - STDMETHODIMP DragOver(DWORD, POINTL, LPDWORD); - STDMETHODIMP DragLeave(); - STDMETHODIMP Drop(LPDATAOBJECT, DWORD, POINTL, LPDWORD); + STDMETHODIMP DragEnter(LPDATAOBJECT, DWORD, POINTL, LPDWORD) wxOVERRIDE; + STDMETHODIMP DragOver(DWORD, POINTL, LPDWORD) wxOVERRIDE; + STDMETHODIMP DragLeave() wxOVERRIDE; + STDMETHODIMP Drop(LPDATAOBJECT, DWORD, POINTL, LPDWORD) wxOVERRIDE; DECLARE_IUNKNOWN_METHODS; diff --git a/src/msw/renderer.cpp b/src/msw/renderer.cpp index eab1d69484..8889507d2a 100644 --- a/src/msw/renderer.cpp +++ b/src/msw/renderer.cpp @@ -164,7 +164,7 @@ public: virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, - int flags = 0) = 0; + int flags = 0) wxOVERRIDE = 0; }; // ---------------------------------------------------------------------------- diff --git a/src/msw/richtooltip.cpp b/src/msw/richtooltip.cpp index f445251242..0e75794889 100644 --- a/src/msw/richtooltip.cpp +++ b/src/msw/richtooltip.cpp @@ -76,7 +76,7 @@ public: } virtual void SetBackgroundColour(const wxColour& col, - const wxColour& colEnd) + const wxColour& colEnd) wxOVERRIDE { // Setting background colour is not supported neither. m_canUseNative = false; @@ -84,7 +84,7 @@ public: wxRichToolTipGenericImpl::SetBackgroundColour(col, colEnd); } - virtual void SetCustomIcon(const wxIcon& icon) + virtual void SetCustomIcon(const wxIcon& icon) wxOVERRIDE { // Custom icons are not supported by EM_SHOWBALLOONTIP. m_canUseNative = false; @@ -92,7 +92,7 @@ public: wxRichToolTipGenericImpl::SetCustomIcon(icon); } - virtual void SetStandardIcon(int icon) + virtual void SetStandardIcon(int icon) wxOVERRIDE { wxRichToolTipGenericImpl::SetStandardIcon(icon); if ( !m_canUseNative ) @@ -123,7 +123,7 @@ public: } virtual void SetTimeout(unsigned millisecondsTimeout, - unsigned millisecondsDelay) + unsigned millisecondsDelay) wxOVERRIDE { // We don't support changing the timeout or the delay // (maybe TTM_SETDELAYTIME could be used for this?). @@ -133,7 +133,7 @@ public: millisecondsDelay); } - virtual void SetTipKind(wxTipKind tipKind) + virtual void SetTipKind(wxTipKind tipKind) wxOVERRIDE { // Setting non-default tip is not supported. if ( tipKind != wxTipKind_Auto ) @@ -142,7 +142,7 @@ public: wxRichToolTipGenericImpl::SetTipKind(tipKind); } - virtual void SetTitleFont(const wxFont& font) + virtual void SetTitleFont(const wxFont& font) wxOVERRIDE { // Setting non-default font is not supported. m_canUseNative = false; @@ -150,7 +150,7 @@ public: wxRichToolTipGenericImpl::SetTitleFont(font); } - virtual void ShowFor(wxWindow* win, const wxRect* rect) + virtual void ShowFor(wxWindow* win, const wxRect* rect) wxOVERRIDE { // TODO: We could use native tooltip control to show native balloon // tooltips for any window but right now we use the simple diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 70a95b6dfe..696103e738 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -168,17 +168,17 @@ public: wxTextCtrlOleCallback(wxTextCtrl *text) : m_textCtrl(text), m_menu(NULL) {} virtual ~wxTextCtrlOleCallback() { DeleteContextMenuObject(); } - STDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) { return E_NOTIMPL; } - STDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) { return E_NOTIMPL; } - STDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) { return E_NOTIMPL; } - STDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) { return E_NOTIMPL; } - STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) { return E_NOTIMPL; } - STDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) { return E_NOTIMPL; } - STDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) { return E_NOTIMPL; } - STDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) { return E_NOTIMPL; } - STDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) { return E_NOTIMPL; } + STDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) wxOVERRIDE { return E_NOTIMPL; } + STDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) wxOVERRIDE { return E_NOTIMPL; } - STDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) + STDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu) wxOVERRIDE { // 'menu' will be shown and destroyed by the caller. We need to keep // its wx counterpart, the wxMenu instance, around until it is diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp index b0b84739bd..3151ba42bd 100644 --- a/src/msw/utilsexc.cpp +++ b/src/msw/utilsexc.cpp @@ -135,8 +135,8 @@ public: class wxExecuteModule : public wxModule { public: - virtual bool OnInit() { return true; } - virtual void OnExit() + virtual bool OnInit() wxOVERRIDE { return true; } + virtual void OnExit() wxOVERRIDE { if ( gs_heventShutdown.IsOk() ) { diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in index 98bd996ab7..72a701a3a4 100644 --- a/src/stc/stc.h.in +++ b/src/stc/stc.h.in @@ -609,7 +609,7 @@ public: bool GetControl() const; bool GetAlt() const; - virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); } + virtual wxEvent* Clone() const wxOVERRIDE { return new wxStyledTextEvent(*this); } #ifndef SWIG private: