use wxOVERRIDE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/affinematrix2d.h

@@ -28,19 +28,19 @@ public:
     }
 
     // Implement base class pure virtual methods.
-    virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr);
+    virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) wxOVERRIDE;
-    virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const;
+    virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const wxOVERRIDE;
-    virtual void Concat(const wxAffineMatrix2DBase& t);
+    virtual void Concat(const wxAffineMatrix2DBase& t) wxOVERRIDE;
-    virtual bool Invert();
+    virtual bool Invert() wxOVERRIDE;
-    virtual bool IsIdentity() const;
+    virtual bool IsIdentity() const wxOVERRIDE;
-    virtual bool IsEqual(const wxAffineMatrix2DBase& t) const;
+    virtual bool IsEqual(const wxAffineMatrix2DBase& t) const wxOVERRIDE;
-    virtual void Translate(wxDouble dx, wxDouble dy);
+    virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE;
-    virtual void Scale(wxDouble xScale, wxDouble yScale);
+    virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE;
-    virtual void Rotate(wxDouble cRadians);
+    virtual void Rotate(wxDouble cRadians) wxOVERRIDE;
 
 protected:
-    virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const;
+    virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const wxOVERRIDE;
-    virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const;
+    virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const wxOVERRIDE;
 
 private:
     wxDouble m_11, m_12, m_21, m_22, m_tx, m_ty;

include/wx/anidecod.h

@@ -36,26 +36,26 @@ public:
     ~wxANIDecoder();
 
 
-    virtual wxSize GetFrameSize(unsigned int frame) const;
+    virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE;
-    virtual wxPoint GetFramePosition(unsigned int frame) const;
+    virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE;
-    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE;
-    virtual long GetDelay(unsigned int frame) const;
+    virtual long GetDelay(unsigned int frame) const wxOVERRIDE;
-    virtual wxColour GetTransparentColour(unsigned int frame) const;
+    virtual wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE;
 
     // implementation of wxAnimationDecoder's pure virtuals
 
-    virtual bool Load( wxInputStream& stream );
+    virtual bool Load( wxInputStream& stream ) wxOVERRIDE;
 
-    bool ConvertToImage(unsigned int frame, wxImage *image) const;
+    bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE;
 
-    wxAnimationDecoder *Clone() const
+    wxAnimationDecoder *Clone() const wxOVERRIDE
         { return new wxANIDecoder; }
-    wxAnimationType GetType() const
+    wxAnimationType GetType() const wxOVERRIDE
         { return wxANIMATION_TYPE_ANI; }
 
 private:
     // wxAnimationDecoder pure virtual:
-    virtual bool DoCanRead( wxInputStream& stream ) const;
+    virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
             // modifies current stream position (see wxAnimationDecoder::CanRead)
 
     // frames stored as wxImage(s): ANI files are meant to be used mostly for animated

include/wx/any.h

@@ -288,13 +288,13 @@ public:
     wxAnyValueTypeImplBase() : wxAnyValueType() { }
     virtual ~wxAnyValueTypeImplBase() { }
 
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
     {
         Ops::DeleteValue(buf);
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
+                            wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         Ops::SetValue(Ops::GetValue(src), dst);
     }
@@ -418,7 +418,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 
@@ -433,7 +433,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 
@@ -520,7 +520,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 //
@@ -537,7 +537,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const;
+                              wxAnyValueBuffer& dst) const wxOVERRIDE;
 };
 
 // WX_ANY_DEFINE_SUB_TYPE requires this
@@ -614,7 +614,7 @@ public:
         wxAnyValueTypeImplBase<wxVariantData*>() { }
     virtual ~wxAnyValueTypeImplVariantData() { }
 
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
     {
         wxVariantData* data = static_cast<wxVariantData*>(buf.m_ptr);
         if ( data )
@@ -622,7 +622,7 @@ public:
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const
+                            wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxVariantData* data = static_cast<wxVariantData*>(src.m_ptr);
         if ( data )
@@ -644,7 +644,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const
+                              wxAnyValueBuffer& dst) const wxOVERRIDE
     {
         wxUnusedVar(src);
         wxUnusedVar(dstType);

include/wx/anybutton.h

@@ -102,7 +102,7 @@ public:
     // Buttons on MSW can look bad if they are not native colours, because
     // then they become owner-drawn and not theme-drawn.  Disable it here
     // in wxAnyButtonBase to make it consistent.
-    virtual bool ShouldInheritColours() const { return false; }
+    virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
 
     // wxUniv-compatible and deprecated equivalents to SetBitmapXXX()
 #if WXWIN_COMPATIBILITY_2_8
@@ -150,7 +150,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     virtual wxBitmap DoGetBitmap(State WXUNUSED(which)) const
         { return wxBitmap(); }

include/wx/app.h

@@ -264,7 +264,7 @@ public:
 
     // Implement the inherited wxEventFilter method but just return -1 from it
     // to indicate that default processing should take place.
-    virtual int FilterEvent(wxEvent& event);
+    virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
 
     // return true if we're running event loop, i.e. if the events can
     // (already) be dispatched
@@ -541,7 +541,7 @@ public:
         // very first initialization function
         //
         // Override: very rarely
-    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
 
         // a platform-dependent version of OnInit(): the code here is likely to
         // depend on the toolkit. default version does nothing.
@@ -556,15 +556,15 @@ public:
         // of the program really starts here
         //
         // Override: rarely in GUI applications, always in console ones.
-    virtual int OnRun();
+    virtual int OnRun() wxOVERRIDE;
 
         // a matching function for OnInit()
-    virtual int OnExit();
+    virtual int OnExit() wxOVERRIDE;
 
         // very last clean up function
         //
         // Override: very rarely
-    virtual void CleanUp();
+    virtual void CleanUp() wxOVERRIDE;
 
 
     // the worker functions - usually not used directly by the user code
@@ -579,10 +579,10 @@ public:
         // parties
         //
         // it should return true if more idle events are needed, false if not
-    virtual bool ProcessIdle();
+    virtual bool ProcessIdle() wxOVERRIDE;
 
         // override base class version: GUI apps always use an event loop
-    virtual bool UsesEventLoop() const { return true; }
+    virtual bool UsesEventLoop() const wxOVERRIDE { return true; }
 
 
     // top level window functions
@@ -645,8 +645,8 @@ public:
     // ------------------------------------------------------------------------
 
 #if wxUSE_CMDLINE_PARSER
-    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
-    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
 #endif
 
     // miscellaneous other stuff
@@ -659,7 +659,7 @@ public:
 
 protected:
     // override base class method to use GUI traits
-    virtual wxAppTraits *CreateTraits();
+    virtual wxAppTraits *CreateTraits() wxOVERRIDE;
 
 
     // the main top level window (may be NULL)

include/wx/apptrait.h

@@ -199,19 +199,19 @@ public:
 #endif // !wxUSE_CONSOLE_EVENTLOOP
 
 #if wxUSE_LOG
-    virtual wxLog *CreateLogTarget();
+    virtual wxLog *CreateLogTarget() wxOVERRIDE;
 #endif // wxUSE_LOG
-    virtual wxMessageOutput *CreateMessageOutput();
+    virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE;
 #if wxUSE_FONTMAP
-    virtual wxFontMapper *CreateFontMapper();
+    virtual wxFontMapper *CreateFontMapper() wxOVERRIDE;
 #endif // wxUSE_FONTMAP
-    virtual wxRendererNative *CreateRenderer();
+    virtual wxRendererNative *CreateRenderer() wxOVERRIDE;
 
-    virtual bool ShowAssertDialog(const wxString& msg);
+    virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
-    virtual bool HasStderr();
+    virtual bool HasStderr() wxOVERRIDE;
 
     // the GetToolkitVersion for console application is always the same
-    virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const
+    virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const wxOVERRIDE
     {
         // no toolkits (wxBase is for console applications without GUI support)
         // NB: zero means "no toolkit", -1 means "not initialized yet"
@@ -221,8 +221,8 @@ public:
         return wxPORT_BASE;
     }
 
-    virtual bool IsUsingUniversalWidgets() const { return false; }
+    virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { return false; }
-    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
+    virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; }
 };
 
 // ----------------------------------------------------------------------------
@@ -235,18 +235,18 @@ class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG
-    virtual wxLog *CreateLogTarget();
+    virtual wxLog *CreateLogTarget() wxOVERRIDE;
 #endif // wxUSE_LOG
-    virtual wxMessageOutput *CreateMessageOutput();
+    virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE;
 #if wxUSE_FONTMAP
-    virtual wxFontMapper *CreateFontMapper();
+    virtual wxFontMapper *CreateFontMapper() wxOVERRIDE;
 #endif // wxUSE_FONTMAP
-    virtual wxRendererNative *CreateRenderer();
+    virtual wxRendererNative *CreateRenderer() wxOVERRIDE;
 
-    virtual bool ShowAssertDialog(const wxString& msg);
+    virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
-    virtual bool HasStderr();
+    virtual bool HasStderr() wxOVERRIDE;
 
-    virtual bool IsUsingUniversalWidgets() const
+    virtual bool IsUsingUniversalWidgets() const wxOVERRIDE
     {
     #ifdef __WXUNIVERSAL__
         return true;
@@ -255,7 +255,7 @@ public:
     #endif
     }
 
-    virtual wxString GetDesktopEnvironment() const { return wxEmptyString; }
+    virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; }
 };
 
 #endif // wxUSE_GUI

include/wx/archive.h

@@ -99,7 +99,7 @@ public:
 
     wxArchiveEntry *GetNextEntry()  { return DoGetNextEntry(); }
 
-    virtual char Peek()             { return wxInputStream::Peek(); }
+    virtual char Peek() wxOVERRIDE  { return wxInputStream::Peek(); }
 
 protected:
     wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv);

include/wx/aui/auibook.h

@@ -75,7 +75,7 @@ public:
         m_dragSource = c.m_dragSource;
     }
 #endif
-    wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); }
+    wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); }
 
     void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; }
     wxAuiNotebook* GetDragSource() const { return m_dragSource; }
@@ -206,7 +206,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     void OnPaint(wxPaintEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
@@ -268,7 +268,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0);
 
-    void SetWindowStyleFlag(long style);
+    void SetWindowStyleFlag(long style) wxOVERRIDE;
     void SetArtProvider(wxAuiTabArt* art);
     wxAuiTabArt* GetArtProvider() const;
 
@@ -286,15 +286,15 @@ public:
                     bool select = false,
                     const wxBitmap& bitmap = wxNullBitmap);
 
-    bool DeletePage(size_t page);
+    bool DeletePage(size_t page) wxOVERRIDE;
-    bool RemovePage(size_t page);
+    bool RemovePage(size_t page) wxOVERRIDE;
 
-    virtual size_t GetPageCount() const;
+    virtual size_t GetPageCount() const wxOVERRIDE;
-    virtual wxWindow* GetPage(size_t pageIdx) const;
+    virtual wxWindow* GetPage(size_t pageIdx) const wxOVERRIDE;
     int GetPageIndex(wxWindow* pageWnd) const;
 
-    bool SetPageText(size_t page, const wxString& text);
+    bool SetPageText(size_t page, const wxString& text) wxOVERRIDE;
-    wxString GetPageText(size_t pageIdx) const;
+    wxString GetPageText(size_t pageIdx) const wxOVERRIDE;
 
     bool SetPageToolTip(size_t page, const wxString& text);
     wxString GetPageToolTip(size_t pageIdx) const;
@@ -302,8 +302,8 @@ public:
     bool SetPageBitmap(size_t page, const wxBitmap& bitmap);
     wxBitmap GetPageBitmap(size_t pageIdx) const;
 
-    int SetSelection(size_t newPage);
+    int SetSelection(size_t newPage) wxOVERRIDE;
-    int GetSelection() const;
+    int GetSelection() const wxOVERRIDE;
 
     virtual void Split(size_t page, int direction);
 
@@ -319,7 +319,7 @@ public:
     void SetMeasuringFont(const wxFont& font);
 
     // Sets the tab font
-    virtual bool SetFont(const wxFont& font);
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
 
     // Gets the tab control height
     int GetTabCtrlHeight() const;
@@ -331,36 +331,36 @@ public:
     bool ShowWindowMenu();
 
     // we do have multiple pages
-    virtual bool HasMultiplePages() const { return true; }
+    virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
 
     // we don't want focus for ourselves
     // virtual bool AcceptsFocus() const { return false; }
 
     //wxBookCtrlBase functions
 
-    virtual void SetPageSize (const wxSize &size);
+    virtual void SetPageSize (const wxSize &size) wxOVERRIDE;
-    virtual int  HitTest (const wxPoint &pt, long *flags=NULL) const;
+    virtual int  HitTest (const wxPoint &pt, long *flags=NULL) const wxOVERRIDE;
 
-    virtual int GetPageImage(size_t n) const;
+    virtual int GetPageImage(size_t n) const wxOVERRIDE;
-    virtual bool SetPageImage(size_t n, int imageId);
+    virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
 
-    virtual int ChangeSelection(size_t n);
+    virtual int ChangeSelection(size_t n) wxOVERRIDE;
 
     virtual bool AddPage(wxWindow *page, const wxString &text, bool select, 
-                         int imageId);
+                         int imageId) wxOVERRIDE;
-    virtual bool DeleteAllPages();
+    virtual bool DeleteAllPages() wxOVERRIDE;
     virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text,
-                            bool select, int imageId);
+                            bool select, int imageId) wxOVERRIDE;
 
 protected:
     // Common part of all ctors.
     void Init();
 
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     // Redo sizing after thawing
-    virtual void DoThaw();
+    virtual void DoThaw() wxOVERRIDE;
 
     // these can be overridden
 
@@ -372,7 +372,7 @@ protected:
     virtual wxSize CalculateNewSplitSize();
 
     // remove the page and return a pointer to it
-    virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) { return NULL; }
+    virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) wxOVERRIDE { return NULL; }
 
     //A general selection function
     virtual int DoModifySelection(size_t n, bool events);

include/wx/aui/framemanager.h

@@ -696,7 +696,7 @@ public:
         dc = c.dc;
     }
 #endif
-    wxEvent *Clone() const { return new wxAuiManagerEvent(*this); }
+    wxEvent *Clone() const wxOVERRIDE { return new wxAuiManagerEvent(*this); }
 
     void SetManager(wxAuiManager* mgr) { manager = mgr; }
     void SetPane(wxAuiPaneInfo* p) { pane = p; }

include/wx/aui/tabart.h

@@ -120,26 +120,26 @@ public:
     wxAuiGenericTabArt();
     virtual ~wxAuiGenericTabArt();
 
-    wxAuiTabArt* Clone();
+    wxAuiTabArt* Clone() wxOVERRIDE;
-    void SetFlags(unsigned int flags);
+    void SetFlags(unsigned int flags) wxOVERRIDE;
     void SetSizingInfo(const wxSize& tabCtrlSize,
-                       size_t tabCount);
+                       size_t tabCount) wxOVERRIDE;
 
-    void SetNormalFont(const wxFont& font);
+    void SetNormalFont(const wxFont& font) wxOVERRIDE;
-    void SetSelectedFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font) wxOVERRIDE;
-    void SetMeasuringFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
-    void SetColour(const wxColour& colour);
+    void SetColour(const wxColour& colour) wxOVERRIDE;
-    void SetActiveColour(const wxColour& colour);
+    void SetActiveColour(const wxColour& colour) wxOVERRIDE;
 
     void DrawBorder(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect);
+                 const wxRect& rect) wxOVERRIDE;
 
     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect);
+                 const wxRect& rect) wxOVERRIDE;
 
     void DrawTab(wxDC& dc,
                  wxWindow* wnd,
@@ -148,7 +148,7 @@ public:
                  int closeButtonState,
                  wxRect* outTabRect,
                  wxRect* outButtonRect,
-                 int* xExtent);
+                 int* xExtent) wxOVERRIDE;
 
     void DrawButton(
                  wxDC& dc,
@@ -157,15 +157,15 @@ public:
                  int bitmapId,
                  int buttonState,
                  int orientation,
-                 wxRect* outRect);
+                 wxRect* outRect) wxOVERRIDE;
 
-    int GetIndentSize();
+    int GetIndentSize() wxOVERRIDE;
 
     int GetBorderWidth(
-                 wxWindow* wnd);
+                 wxWindow* wnd) wxOVERRIDE;
 
     int GetAdditionalBorderSpace(
-                 wxWindow* wnd);
+                 wxWindow* wnd) wxOVERRIDE;
 
     wxSize GetTabSize(
                  wxDC& dc,
@@ -174,16 +174,16 @@ public:
                  const wxBitmap& bitmap,
                  bool active,
                  int closeButtonState,
-                 int* xExtent);
+                 int* xExtent) wxOVERRIDE;
 
     int ShowDropDown(
                  wxWindow* wnd,
                  const wxAuiNotebookPageArray& items,
-                 int activeIdx);
+                 int activeIdx) wxOVERRIDE;
 
     int GetBestTabCtrlSize(wxWindow* wnd,
                  const wxAuiNotebookPageArray& pages,
-                 const wxSize& requiredBmpSize);
+                 const wxSize& requiredBmpSize) wxOVERRIDE;
 
 protected:
 
@@ -218,27 +218,27 @@ public:
     wxAuiSimpleTabArt();
     virtual ~wxAuiSimpleTabArt();
 
-    wxAuiTabArt* Clone();
+    wxAuiTabArt* Clone() wxOVERRIDE;
-    void SetFlags(unsigned int flags);
+    void SetFlags(unsigned int flags) wxOVERRIDE;
 
     void SetSizingInfo(const wxSize& tabCtrlSize,
-                       size_t tabCount);
+                       size_t tabCount) wxOVERRIDE;
 
-    void SetNormalFont(const wxFont& font);
+    void SetNormalFont(const wxFont& font) wxOVERRIDE;
-    void SetSelectedFont(const wxFont& font);
+    void SetSelectedFont(const wxFont& font) wxOVERRIDE;
-    void SetMeasuringFont(const wxFont& font);
+    void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
-    void SetColour(const wxColour& colour);
+    void SetColour(const wxColour& colour) wxOVERRIDE;
-    void SetActiveColour(const wxColour& colour);
+    void SetActiveColour(const wxColour& colour) wxOVERRIDE;
 
     void DrawBorder(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect);
+                 const wxRect& rect) wxOVERRIDE;
 
     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect);
+                 const wxRect& rect) wxOVERRIDE;
 
     void DrawTab(wxDC& dc,
                  wxWindow* wnd,
@@ -247,7 +247,7 @@ public:
                  int closeButtonState,
                  wxRect* outTabRect,
                  wxRect* outButtonRect,
-                 int* xExtent);
+                 int* xExtent) wxOVERRIDE;
 
     void DrawButton(
                  wxDC& dc,
@@ -256,15 +256,15 @@ public:
                  int bitmapId,
                  int buttonState,
                  int orientation,
-                 wxRect* outRect);
+                 wxRect* outRect) wxOVERRIDE;
 
-    int GetIndentSize();
+    int GetIndentSize() wxOVERRIDE;
 
     int GetBorderWidth(
-                 wxWindow* wnd);
+                 wxWindow* wnd) wxOVERRIDE;
 
     int GetAdditionalBorderSpace(
-                 wxWindow* wnd);
+                 wxWindow* wnd) wxOVERRIDE;
 
     wxSize GetTabSize(
                  wxDC& dc,
@@ -273,16 +273,16 @@ public:
                  const wxBitmap& bitmap,
                  bool active,
                  int closeButtonState,
-                 int* xExtent);
+                 int* xExtent) wxOVERRIDE;
 
     int ShowDropDown(
                  wxWindow* wnd,
                  const wxAuiNotebookPageArray& items,
-                 int activeIdx);
+                 int activeIdx) wxOVERRIDE;
 
     int GetBestTabCtrlSize(wxWindow* wnd,
                  const wxAuiNotebookPageArray& pages,
-                 const wxSize& requiredBmpSize);
+                 const wxSize& requiredBmpSize) wxOVERRIDE;
 
 protected:
 

include/wx/aui/tabartgtk.h

@@ -31,9 +31,9 @@ class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt
 public:
     wxAuiGtkTabArt();
 
-    virtual wxAuiTabArt* Clone();
+    virtual wxAuiTabArt* Clone() wxOVERRIDE;
-    virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect);
+    virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
-    virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect);
+    virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
     virtual void DrawTab(wxDC& dc,
                          wxWindow* wnd,
                          const wxAuiNotebookPage& page,
@@ -41,16 +41,16 @@ public:
                          int close_button_state,
                          wxRect* out_tab_rect,
                          wxRect* out_button_rect,
-                         int* x_extent);
+                         int* x_extent) wxOVERRIDE;
     void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id,
-                    int button_state, int orientation, wxRect* out_rect);
+                    int button_state, int orientation, wxRect* out_rect) wxOVERRIDE;
     int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages,
-                            const wxSize& required_bmp_size);
+                            const wxSize& required_bmp_size) wxOVERRIDE;
-    int GetBorderWidth(wxWindow* wnd);
+    int GetBorderWidth(wxWindow* wnd) wxOVERRIDE;
-    int GetAdditionalBorderSpace(wxWindow* wnd);
+    int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE;
     virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption,
                               const wxBitmap& bitmap, bool active,
-                              int close_button_state, int* x_extent);
+                              int close_button_state, int* x_extent) wxOVERRIDE;
 };
 
 #endif  // wxUSE_AUI

include/wx/bannerwindow.h

@@ -87,7 +87,7 @@ public:
     void SetGradient(const wxColour& start, const wxColour& end);
 
 protected:
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
 
 private:
     // Common part of all constructors.

include/wx/bookctrl.h

@@ -226,13 +226,13 @@ public:
 
 
     // we do have multiple pages
-    virtual bool HasMultiplePages() const { return true; }
+    virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
 
     // we don't want focus for ourselves
-    virtual bool AcceptsFocus() const { return false; }
+    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
 
     // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const { return false; }
+    virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
 
 protected:
     // flags for DoSetSelection()
@@ -242,7 +242,7 @@ protected:
     };
 
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     // After the insertion of the page in the method InsertPage, calling this
     // method sets the selection to the given page or the first one if there is
@@ -303,7 +303,7 @@ protected:
     virtual wxWindow *DoRemovePage(size_t page) = 0;
 
     // our best size is the size which fits all our pages
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
     // helper: get the next page wrapping if we reached the end
     int GetNextPage(bool forward) const;
@@ -384,7 +384,7 @@ public:
         m_nOldSel = event.m_nOldSel;
     }
 
-    virtual wxEvent *Clone() const { return new wxBookCtrlEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxBookCtrlEvent(*this); }
 
     // accessors
         // the currently selected page (wxNOT_FOUND if none)

include/wx/calctrl.h

@@ -167,7 +167,7 @@ public:
     void SetWeekDay(const wxDateTime::WeekDay wd) { m_wday = wd; }
     wxDateTime::WeekDay GetWeekDay() const { return m_wday; }
 
-    virtual wxEvent *Clone() const { return new wxCalendarEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalendarEvent(*this); }
 
 private:
     wxDateTime::WeekDay m_wday;

include/wx/checkbox.h

@@ -97,10 +97,10 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
-    virtual bool HasTransparentBackground() { return true; }
+    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
 
     // wxCheckBox-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event)
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE
     {
         wxControl::DoUpdateWindowUI(event);
 
@@ -110,7 +110,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state)) { wxFAIL; }
 

include/wx/choice.h

@@ -52,17 +52,17 @@ public:
     virtual int GetColumns() const { return 1 ; }
 
     // emulate selecting the item event.GetInt()
-    void Command(wxCommandEvent& event);
+    void Command(wxCommandEvent& event) wxOVERRIDE;
 
     // override wxItemContainer::IsSorted
-    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
+    virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); }
 
 protected:
     // The generic implementation doesn't determine the height correctly and
     // doesn't account for the width of the arrow but does take into account
     // the string widths, so the derived classes should override it and set the
     // height and add the arrow width to the size returned by this version.
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxChoiceBase);

include/wx/choicebk.h

@@ -60,21 +60,21 @@ public:
                 const wxString& name = wxEmptyString);
 
 
-    virtual bool SetPageText(size_t n, const wxString& strText);
+    virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
-    virtual wxString GetPageText(size_t n) const;
+    virtual wxString GetPageText(size_t n) const wxOVERRIDE;
-    virtual int GetPageImage(size_t n) const;
+    virtual int GetPageImage(size_t n) const wxOVERRIDE;
-    virtual bool SetPageImage(size_t n, int imageId);
+    virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE);
+                            int imageId = NO_IMAGE) wxOVERRIDE;
-    virtual int SetSelection(size_t n)
+    virtual int SetSelection(size_t n) wxOVERRIDE
         { return DoSetSelection(n, SetSelection_SendEvent); }
-    virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
+    virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); }
-    virtual void SetImageList(wxImageList *imageList);
+    virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
 
-    virtual bool DeleteAllPages();
+    virtual bool DeleteAllPages() wxOVERRIDE;
 
     // returns the choice control
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
@@ -82,21 +82,21 @@ public:
     // Override this to return true because the part of parent window
     // background between our controlling wxChoice and the page area should
     // show through.
-    virtual bool HasTransparentBackground() { return true; }
+    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
 
 protected:
-    virtual void DoSetWindowVariant(wxWindowVariant variant);
+    virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE;
 
-    virtual wxWindow *DoRemovePage(size_t page);
+    virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
 
-    void UpdateSelectedPage(size_t newsel)
+    void UpdateSelectedPage(size_t newsel) wxOVERRIDE
     {
         m_selection = static_cast<int>(newsel);
         GetChoiceCtrl()->Select(m_selection);
     }
 
-    wxBookCtrlEvent* CreatePageChangingEvent() const;
+    wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE;
-    void MakeChangedEvent(wxBookCtrlEvent &event);
+    void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE;
 
     // event handlers
     void OnChoiceSelected(wxCommandEvent& event);

include/wx/clipbrd.h

@@ -117,7 +117,7 @@ public:
     bool SupportsFormat(const wxDataFormat& format) const;
     void AddFormat(const wxDataFormat& format);
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxClipboardEvent(*this);
     }

include/wx/clrpicker.h

@@ -134,16 +134,16 @@ public:         // public API
 public:        // internal functions
 
     // update the button colour to match the text control contents
-    void UpdatePickerFromTextCtrl();
+    void UpdatePickerFromTextCtrl() wxOVERRIDE;
 
     // update the text control to match the button's colour
-    void UpdateTextCtrlFromPicker();
+    void UpdateTextCtrlFromPicker() wxOVERRIDE;
 
     // event handler for our picker
     void OnColourChange(wxColourPickerEvent &);
 
 protected:
-    virtual long GetPickerStyle(long style) const
+    virtual long GetPickerStyle(long style) const wxOVERRIDE
         { return (style & wxCLRP_SHOW_LABEL); }
 
 private:
@@ -173,7 +173,7 @@ public:
 
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxColourPickerEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxColourPickerEvent(*this); }
 
 private:
     wxColour m_colour;

include/wx/collpane.h

@@ -70,7 +70,7 @@ public:
 
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxCollapsiblePaneEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCollapsiblePaneEvent(*this); }
 
 private:
     bool m_bCollapsed;

include/wx/colour.h

@@ -182,14 +182,14 @@ protected:
     // wxColour doesn't use reference counted data (at least not in all ports)
     // so provide stubs for the functions which need to be defined if we do use
     // them
-    virtual wxGDIRefData *CreateGDIRefData() const
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE
     {
         wxFAIL_MSG( "must be overridden if used" );
 
         return NULL;
     }
 
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE
     {
         wxFAIL_MSG( "must be overridden if used" );
 

include/wx/combo.h

@@ -204,9 +204,9 @@ public:
     wxWindow *GetButton() const { return m_btn; }
 
     // forward these methods to all subcontrols
-    virtual bool Enable(bool enable = true);
+    virtual bool Enable(bool enable = true) wxOVERRIDE;
-    virtual bool Show(bool show = true);
+    virtual bool Show(bool show = true) wxOVERRIDE;
-    virtual bool SetFont(const wxFont& font);
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
 
     //
     // wxTextEntry methods
@@ -214,49 +214,49 @@ public:
     // NB: We basically need to override all of them because there is
     //     no guarantee how platform-specific wxTextEntry is implemented.
     //
-    virtual void SetValue(const wxString& value)
+    virtual void SetValue(const wxString& value) wxOVERRIDE
         { wxTextEntryBase::SetValue(value); }
-    virtual void ChangeValue(const wxString& value)
+    virtual void ChangeValue(const wxString& value) wxOVERRIDE
         { wxTextEntryBase::ChangeValue(value); }
 
-    virtual void WriteText(const wxString& text);
+    virtual void WriteText(const wxString& text) wxOVERRIDE;
-    virtual void AppendText(const wxString& text)
+    virtual void AppendText(const wxString& text) wxOVERRIDE
         { wxTextEntryBase::AppendText(text); }
 
-    virtual wxString GetValue() const
+    virtual wxString GetValue() const wxOVERRIDE
         { return wxTextEntryBase::GetValue(); }
 
-    virtual wxString GetRange(long from, long to) const
+    virtual wxString GetRange(long from, long to) const wxOVERRIDE
         { return wxTextEntryBase::GetRange(from, to); }
 
     // Replace() and DoSetValue() need to be fully re-implemented since
     // EventSuppressor utility class does not work with the way
     // wxComboCtrl is implemented.
-    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE;
 
-    virtual void Remove(long from, long to);
+    virtual void Remove(long from, long to) wxOVERRIDE;
 
-    virtual void Copy();
+    virtual void Copy() wxOVERRIDE;
-    virtual void Cut();
+    virtual void Cut() wxOVERRIDE;
-    virtual void Paste();
+    virtual void Paste() wxOVERRIDE;
 
-    virtual void Undo();
+    virtual void Undo() wxOVERRIDE;
-    virtual void Redo();
+    virtual void Redo() wxOVERRIDE;
-    virtual bool CanUndo() const;
+    virtual bool CanUndo() const wxOVERRIDE;
-    virtual bool CanRedo() const;
+    virtual bool CanRedo() const wxOVERRIDE;
 
-    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
-    virtual long GetInsertionPoint() const;
+    virtual long GetInsertionPoint() const wxOVERRIDE;
-    virtual long GetLastPosition() const;
+    virtual long GetLastPosition() const wxOVERRIDE;
 
-    virtual void SetSelection(long from, long to);
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
-    virtual void GetSelection(long *from, long *to) const;
+    virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
 
-    virtual bool IsEditable() const;
+    virtual bool IsEditable() const wxOVERRIDE;
-    virtual void SetEditable(bool editable);
+    virtual void SetEditable(bool editable) wxOVERRIDE;
 
-    virtual bool SetHint(const wxString& hint);
+    virtual bool SetHint(const wxString& hint) wxOVERRIDE;
-    virtual wxString GetHint() const;
+    virtual wxString GetHint() const wxOVERRIDE;
 
     // This method sets the text without affecting list selection
     // (ie. wxComboPopup::SetStringValue doesn't get called).
@@ -467,12 +467,12 @@ public:
     void SetCtrlMainWnd( wxWindow* wnd ) { m_mainCtrlWnd = wnd; }
 
     // This is public so we can access it from wxComboCtrlTextCtrl
-    virtual wxWindow *GetMainWindowOfCompositeControl()
+    virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE
         { return m_mainCtrlWnd; }
 
     // also set the embedded wxTextCtrl colours
-    virtual bool SetForegroundColour(const wxColour& colour);
+    virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
-    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
 
 protected:
 
@@ -546,8 +546,8 @@ protected:
     // override the base class virtuals involved in geometry calculations
     // The common version only sets a default width, so the derived classes
     // should override it and set the height and change the width as needed.
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
-    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
 
     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);
@@ -598,17 +598,17 @@ protected:
     virtual bool AnimateShow( const wxRect& rect, int flags );
 
 #if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
+    virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
 #endif
 
     // protected wxTextEntry methods
-    virtual void DoSetValue(const wxString& value, int flags);
+    virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE;
-    virtual wxString DoGetValue() const;
+    virtual wxString DoGetValue() const wxOVERRIDE;
-    virtual wxWindow *GetEditableWindow() { return this; }
+    virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
 
     // margins functions
-    virtual bool DoSetMargins(const wxPoint& pt);
+    virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE;
-    virtual wxPoint DoGetMargins() const;
+    virtual wxPoint DoGetMargins() const wxOVERRIDE;
 
     // This is used when m_text is hidden (readonly).
     wxString                m_valueString;

include/wx/combobox.h

@@ -33,7 +33,7 @@ class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer,
 {
 public:
     // override these methods to disambiguate between two base classes versions
-    virtual void Clear()
+    virtual void Clear() wxOVERRIDE
     {
         wxTextEntry::Clear();
         wxItemContainer::Clear();

include/wx/commandlinkbutton.h

@@ -120,7 +120,7 @@ public:
                 const wxString& name = wxButtonNameStr);
 
     virtual void SetMainLabelAndNote(const wxString& mainLabel,
-                                     const wxString& note)
+                                     const wxString& note) wxOVERRIDE
     {
         wxButton::SetLabel(mainLabel + '\n' + note);
     }

include/wx/containr.h

@@ -137,7 +137,7 @@ class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
 {
 protected:
     // set the focus to the child which had it the last time
-    virtual bool SetFocusToChild();
+    virtual bool SetFocusToChild() wxOVERRIDE;
 };
 
 #else // !wxHAS_NATIVE_TAB_TRAVERSAL

include/wx/control.h

@@ -71,7 +71,7 @@ public:
     int GetAlignment() const { return m_windowStyle & wxALIGN_MASK; }
 
     // set label with mnemonics
-    virtual void SetLabel(const wxString& label)
+    virtual void SetLabel(const wxString& label) wxOVERRIDE
     {
         m_labelOrig = label;
 
@@ -82,7 +82,7 @@ public:
 
     // return the original string, as it was passed to SetLabel()
     // (i.e. with wx-style mnemonics)
-    virtual wxString GetLabel() const { return m_labelOrig; }
+    virtual wxString GetLabel() const wxOVERRIDE { return m_labelOrig; }
 
     // set label text (mnemonics will be escaped)
     virtual void SetLabelText(const wxString& text)
@@ -119,7 +119,7 @@ public:
     // controls by default inherit the colours of their parents, if a
     // particular control class doesn't want to do it, it can override
     // ShouldInheritColours() to return false
-    virtual bool ShouldInheritColours() const { return true; }
+    virtual bool ShouldInheritColours() const wxOVERRIDE { return true; }
 
 
     // WARNING: this doesn't work for all controls nor all platforms!
@@ -128,10 +128,10 @@ public:
     // if the button was clicked)
     virtual void Command(wxCommandEvent &event);
 
-    virtual bool SetFont(const wxFont& font);
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
 
     // wxControl-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE;
 
     wxSize GetSizeFromTextSize(int xlen, int ylen = -1) const
         { return DoGetSizeFromTextSize(xlen, ylen); }
@@ -176,7 +176,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const;
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
 
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children

include/wx/convauto.h

@@ -71,14 +71,14 @@ public:
 
     // override the base class virtual function(s) to use our m_conv
     virtual size_t ToWChar(wchar_t *dst, size_t dstLen,
-                           const char *src, size_t srcLen = wxNO_LEN) const;
+                           const char *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
 
     virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const;
+                             const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
 
-    virtual size_t GetMBNulLen() const { return m_conv->GetMBNulLen(); }
+    virtual size_t GetMBNulLen() const wxOVERRIDE { return m_conv->GetMBNulLen(); }
 
-    virtual wxMBConv *Clone() const { return new wxConvAuto(*this); }
+    virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvAuto(*this); }
 
     // return the BOM type of this buffer
     static wxBOM DetectBOM(const char *src, size_t srcLen);

include/wx/cshelp.h

@@ -204,14 +204,14 @@ class WXDLLIMPEXP_CORE wxSimpleHelpProvider : public wxHelpProvider
 {
 public:
     // implement wxHelpProvider methods
-    virtual wxString GetHelp(const wxWindowBase *window);
+    virtual wxString GetHelp(const wxWindowBase *window) wxOVERRIDE;
 
     // override ShowHelp() and not ShowHelpAtPoint() as explained above
-    virtual bool ShowHelp(wxWindowBase *window);
+    virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE;
 
-    virtual void AddHelp(wxWindowBase *window, const wxString& text);
+    virtual void AddHelp(wxWindowBase *window, const wxString& text) wxOVERRIDE;
-    virtual void AddHelp(wxWindowID id, const wxString& text);
+    virtual void AddHelp(wxWindowID id, const wxString& text) wxOVERRIDE;
-    virtual void RemoveHelp(wxWindowBase* window);
+    virtual void RemoveHelp(wxWindowBase* window) wxOVERRIDE;
 
 protected:
     // we use 2 hashes for storing the help strings associated with windows
@@ -235,7 +235,7 @@ public:
 
     // again (see above): this should be ShowHelpAtPoint() but we need to
     // override ShowHelp() to avoid breaking existing code
-    virtual bool ShowHelp(wxWindowBase *window);
+    virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE;
 
     // Other accessors
     void SetHelpController(wxHelpControllerBase* hc) { m_helpController = hc; }

include/wx/ctrlsub.h

@@ -438,7 +438,7 @@ public:
 
     // usually the controls like list/combo boxes have their own background
     // colour
-    virtual bool ShouldInheritColours() const { return false; }
+    virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
 
 
     // Implementation only from now on.

include/wx/dataobj.h

@@ -225,20 +225,20 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
+    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE
         { return m_format; }
-    virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
+    virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE
         { return 1; }
     virtual void GetAllFormats(wxDataFormat *formats,
-                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE
         { *formats = m_format; }
-    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:
@@ -286,12 +286,12 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const;
+    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE;
-    virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const;
+    virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE;
-    virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const;
+    virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const wxOVERRIDE;
-    virtual size_t GetDataSize(const wxDataFormat& format) const;
+    virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE;
-    virtual bool GetDataHere(const wxDataFormat& format, void *buf) const;
+    virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE;
-    virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf);
+    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 );
@@ -350,20 +350,20 @@ public:
     virtual wxString GetHTML() const { return m_html; }
     virtual void SetHTML(const wxString& html) { m_html = html; }
     
-    virtual size_t GetDataSize() const;
+    virtual size_t GetDataSize() const wxOVERRIDE;
-    virtual bool GetDataHere(void *buf) const;
+    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
-    virtual bool SetData(size_t len, const void *buf);
+    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);
     }
@@ -400,17 +400,17 @@ public:
 
     // some platforms have 2 and not 1 format for text data
 #if defined(wxNEEDS_UTF8_FOR_TEXT_DATAOBJ) || defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
-    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const { return 2; }
+    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const wxOVERRIDE { return 2; }
     virtual void GetAllFormats(wxDataFormat *formats,
-                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const;
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE;
 
-    virtual size_t GetDataSize() const { return GetDataSize(GetPreferredFormat()); }
+    virtual size_t GetDataSize() const wxOVERRIDE { return GetDataSize(GetPreferredFormat()); }
-    virtual bool GetDataHere(void *buf) const { return GetDataHere(GetPreferredFormat(), buf); }
+    virtual bool GetDataHere(void *buf) const wxOVERRIDE { return GetDataHere(GetPreferredFormat(), buf); }
-    virtual bool SetData(size_t len, const void *buf) { return SetData(GetPreferredFormat(), len, buf); }
+    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE { return SetData(GetPreferredFormat(), len, buf); }
 
-    size_t GetDataSize(const wxDataFormat& format) const;
+    size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE;
-    bool GetDataHere(const wxDataFormat& format, void *pBuf) const;
+    bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE;
-    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf);
+    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;
@@ -520,19 +520,19 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual size_t GetDataSize() const;
+    virtual size_t GetDataSize() const wxOVERRIDE;
-    virtual bool GetDataHere(void *buf) const;
+    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
-    virtual bool SetData(size_t size, const void *buf);
+    virtual bool SetData(size_t size, 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);
     }

include/wx/dataview.h

@@ -313,13 +313,13 @@ public:
 
     // implement some base class pure virtual directly
     virtual wxDataViewItem
-    GetParent( const wxDataViewItem & WXUNUSED(item) ) const
+    GetParent( const wxDataViewItem & WXUNUSED(item) ) const wxOVERRIDE
     {
         // items never have valid parent in this model
         return wxDataViewItem();
     }
 
-    virtual bool IsContainer( const wxDataViewItem &item ) const
+    virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE
     {
         // only the invisible (and invalid) root item has children
         return !item.IsOk();
@@ -327,30 +327,30 @@ public:
 
     // and implement some others by forwarding them to our own ones
     virtual void GetValue( wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col ) const
+                           const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE
     {
         GetValueByRow(variant, GetRow(item), col);
     }
 
     virtual bool SetValue( const wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col )
+                           const wxDataViewItem &item, unsigned int col ) wxOVERRIDE
     {
         return SetValueByRow( variant, GetRow(item), col );
     }
 
     virtual bool GetAttr(const wxDataViewItem &item, unsigned int col,
-                         wxDataViewItemAttr &attr) const
+                         wxDataViewItemAttr &attr) const wxOVERRIDE
     {
         return GetAttrByRow( GetRow(item), col, attr );
     }
 
-    virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const
+    virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE
     {
         return IsEnabledByRow( GetRow(item), col );
     }
 
 
-    virtual bool IsListModel() const { return true; }
+    virtual bool IsListModel() const wxOVERRIDE { return true; }
 };
 
 // ---------------------------------------------------------
@@ -373,13 +373,13 @@ public:
 
     // convert to/from row/wxDataViewItem
 
-    virtual unsigned GetRow( const wxDataViewItem &item ) const;
+    virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE;
     wxDataViewItem GetItem( unsigned int row ) const;
 
     // implement base methods
-    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE;
 
-    unsigned int GetCount() const { return m_hash.GetCount(); }
+    unsigned int GetCount() const wxOVERRIDE { return m_hash.GetCount(); }
 
 private:
     wxDataViewItemArray m_hash;
@@ -412,22 +412,22 @@ public:
 
     // convert to/from row/wxDataViewItem
 
-    virtual unsigned GetRow( const wxDataViewItem &item ) const;
+    virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE;
     wxDataViewItem GetItem( unsigned int row ) const;
 
     // compare based on index
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending ) const;
+                         unsigned int column, bool ascending ) const wxOVERRIDE;
-    virtual bool HasDefaultCompare() const;
+    virtual bool HasDefaultCompare() const wxOVERRIDE;
 
     // implement base methods
-    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE;
 
-    unsigned int GetCount() const { return m_size; }
+    unsigned int GetCount() const wxOVERRIDE { return m_size; }
 
     // internal
-    virtual bool IsVirtualListModel() const { return true; }
+    virtual bool IsVirtualListModel() const wxOVERRIDE { return true; }
 
 private:
     unsigned int m_size;
@@ -485,8 +485,8 @@ public:
 
     // implement some of base class pure virtuals (the rest is port-dependent
     // and done differently in generic and native versions)
-    virtual void SetBitmap( const wxBitmap& bitmap ) { m_bitmap = bitmap; }
+    virtual void SetBitmap( const wxBitmap& bitmap ) wxOVERRIDE { m_bitmap = bitmap; }
-    virtual wxBitmap GetBitmap() const { return m_bitmap; }
+    virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; }
 
 protected:
     wxDataViewRenderer      *m_renderer;
@@ -728,7 +728,7 @@ public:
     // define control visual attributes
     // --------------------------------
 
-    virtual wxVisualAttributes GetDefaultAttributes() const
+    virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
     {
         return GetClassDefaultAttributes(GetWindowVariant());
     }
@@ -854,7 +854,7 @@ public:
     wxDragResult GetDropEffect() const { return m_dropEffect; }
 #endif // wxUSE_DRAG_AND_DROP
 
-    virtual wxEvent *Clone() const { return new wxDataViewEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxDataViewEvent(*this); }
 
 protected:
     wxDataViewItem      m_item;
@@ -1000,15 +1000,15 @@ public:
 
     // override base virtuals
 
-    virtual unsigned int GetColumnCount() const;
+    virtual unsigned int GetColumnCount() const wxOVERRIDE;
 
-    virtual wxString GetColumnType( unsigned int col ) const;
+    virtual wxString GetColumnType( unsigned int col ) const wxOVERRIDE;
 
     virtual void GetValueByRow( wxVariant &value,
-                           unsigned int row, unsigned int col ) const;
+                           unsigned int row, unsigned int col ) const wxOVERRIDE;
 
     virtual bool SetValueByRow( const wxVariant &value,
-                           unsigned int row, unsigned int col );
+                           unsigned int row, unsigned int col ) wxOVERRIDE;
 
 
 public:
@@ -1057,10 +1057,10 @@ public:
     bool InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype );
 
     // overridden from base class
-    virtual bool PrependColumn( wxDataViewColumn *col );
+    virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE;
-    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE;
-    virtual bool AppendColumn( wxDataViewColumn *col );
+    virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE;
-    virtual bool ClearColumns();
+    virtual bool ClearColumns() wxOVERRIDE;
 
     wxDataViewColumn *AppendTextColumn( const wxString &label,
           wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
@@ -1185,7 +1185,7 @@ public:
     bool IsExpanded() const
         { return m_isExpanded; }
 
-    virtual bool IsContainer()
+    virtual bool IsContainer() wxOVERRIDE
         { return true; }
 
 private:
@@ -1238,21 +1238,21 @@ public:
     // implement base methods
 
     virtual void GetValue( wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col ) const;
+                           const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE;
     virtual bool SetValue( const wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col );
+                           const wxDataViewItem &item, unsigned int col ) wxOVERRIDE;
-    virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const;
+    virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE;
-    virtual bool IsContainer( const wxDataViewItem &item ) const;
+    virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE;
-    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE;
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending ) const;
+                         unsigned int column, bool ascending ) const wxOVERRIDE;
 
-    virtual bool HasDefaultCompare() const
+    virtual bool HasDefaultCompare() const wxOVERRIDE
         { return true; }
-    virtual unsigned int GetColumnCount() const
+    virtual unsigned int GetColumnCount() const wxOVERRIDE
         { return 1; }
-    virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const
+    virtual wxString GetColumnType( unsigned int WXUNUSED(col) ) const wxOVERRIDE
         { return wxT("wxDataViewIconText"); }
 
     wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const;

include/wx/dateevt.h

@@ -34,7 +34,7 @@ public:
     void SetDate(const wxDateTime &date) { m_date = date; }
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxDateEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxDateEvent(*this); }
 
 private:
     wxDateTime m_date;

include/wx/datetime.h

@@ -1584,10 +1584,10 @@ private:
 class WXDLLIMPEXP_BASE wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
 {
 protected:
-    virtual bool DoIsHoliday(const wxDateTime& dt) const;
+    virtual bool DoIsHoliday(const wxDateTime& dt) const wxOVERRIDE;
     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
                                         const wxDateTime& dtEnd,
-                                        wxDateTimeArray& holidays) const;
+                                        wxDateTimeArray& holidays) const wxOVERRIDE;
 };
 
 // ============================================================================

include/wx/dc.h

@@ -242,15 +242,15 @@ class WXDLLIMPEXP_CORE wxNativeDCFactory: public wxDCFactory
 public:
     wxNativeDCFactory() {}
 
-    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window );
+    virtual wxDCImpl* CreateWindowDC( wxWindowDC *owner, wxWindow *window ) wxOVERRIDE;
-    virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window );
+    virtual wxDCImpl* CreateClientDC( wxClientDC *owner, wxWindow *window ) wxOVERRIDE;
-    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window );
+    virtual wxDCImpl* CreatePaintDC( wxPaintDC *owner, wxWindow *window ) wxOVERRIDE;
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner );
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner ) wxOVERRIDE;
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap );
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxBitmap &bitmap ) wxOVERRIDE;
-    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc );
+    virtual wxDCImpl* CreateMemoryDC( wxMemoryDC *owner, wxDC *dc ) wxOVERRIDE;
-    virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner );
+    virtual wxDCImpl* CreateScreenDC( wxScreenDC *owner ) wxOVERRIDE;
 #if wxUSE_PRINTING_ARCHITECTURE
-    virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  );
+    virtual wxDCImpl* CreatePrinterDC( wxPrinterDC *owner, const wxPrintData &data  ) wxOVERRIDE;
 #endif
 };
 

include/wx/dcmirror.h

@@ -33,39 +33,39 @@ public:
     }
 
     // wxDCBase operations
-    virtual void Clear() { m_dc.Clear(); }
+    virtual void Clear() wxOVERRIDE { m_dc.Clear(); }
-    virtual void SetFont(const wxFont& font) { m_dc.SetFont(font); }
+    virtual void SetFont(const wxFont& font) wxOVERRIDE { m_dc.SetFont(font); }
-    virtual void SetPen(const wxPen& pen) { m_dc.SetPen(pen); }
+    virtual void SetPen(const wxPen& pen) wxOVERRIDE { m_dc.SetPen(pen); }
-    virtual void SetBrush(const wxBrush& brush) { m_dc.SetBrush(brush); }
+    virtual void SetBrush(const wxBrush& brush) wxOVERRIDE { m_dc.SetBrush(brush); }
-    virtual void SetBackground(const wxBrush& brush)
+    virtual void SetBackground(const wxBrush& brush) wxOVERRIDE
         { m_dc.SetBackground(brush); }
-    virtual void SetBackgroundMode(int mode) { m_dc.SetBackgroundMode(mode); }
+    virtual void SetBackgroundMode(int mode) wxOVERRIDE { m_dc.SetBackgroundMode(mode); }
 #if wxUSE_PALETTE
-    virtual void SetPalette(const wxPalette& palette)
+    virtual void SetPalette(const wxPalette& palette) wxOVERRIDE
         { m_dc.SetPalette(palette); }
 #endif // wxUSE_PALETTE
-    virtual void DestroyClippingRegion() { m_dc.DestroyClippingRegion(); }
+    virtual void DestroyClippingRegion() wxOVERRIDE { m_dc.DestroyClippingRegion(); }
-    virtual wxCoord GetCharHeight() const { return m_dc.GetCharHeight(); }
+    virtual wxCoord GetCharHeight() const wxOVERRIDE { return m_dc.GetCharHeight(); }
-    virtual wxCoord GetCharWidth() const { return m_dc.GetCharWidth(); }
+    virtual wxCoord GetCharWidth() const wxOVERRIDE { return m_dc.GetCharWidth(); }
-    virtual bool CanDrawBitmap() const { return m_dc.CanDrawBitmap(); }
+    virtual bool CanDrawBitmap() const wxOVERRIDE { return m_dc.CanDrawBitmap(); }
-    virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); }
+    virtual bool CanGetTextExtent() const wxOVERRIDE { return m_dc.CanGetTextExtent(); }
-    virtual int GetDepth() const { return m_dc.GetDepth(); }
+    virtual int GetDepth() const wxOVERRIDE { return m_dc.GetDepth(); }
-    virtual wxSize GetPPI() const { return m_dc.GetPPI(); }
+    virtual wxSize GetPPI() const wxOVERRIDE { return m_dc.GetPPI(); }
-    virtual bool IsOk() const { return m_dc.IsOk(); }
+    virtual bool IsOk() const wxOVERRIDE { return m_dc.IsOk(); }
-    virtual void SetMapMode(wxMappingMode mode) { m_dc.SetMapMode(mode); }
+    virtual void SetMapMode(wxMappingMode mode) wxOVERRIDE { m_dc.SetMapMode(mode); }
-    virtual void SetUserScale(double x, double y)
+    virtual void SetUserScale(double x, double y) wxOVERRIDE
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }
-    virtual void SetLogicalOrigin(wxCoord x, wxCoord y)
+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y) wxOVERRIDE
         { m_dc.SetLogicalOrigin(GetX(x, y), GetY(x, y)); }
-    virtual void SetDeviceOrigin(wxCoord x, wxCoord y)
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y) wxOVERRIDE
         { m_dc.SetDeviceOrigin(GetX(x, y), GetY(x, y)); }
-    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp) wxOVERRIDE
         { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp),
                                   GetY(xLeftRight, yBottomUp)); }
-    virtual void SetLogicalFunction(wxRasterOperationMode function)
+    virtual void SetLogicalFunction(wxRasterOperationMode function) wxOVERRIDE
         { m_dc.SetLogicalFunction(function); }
 
-    virtual void* GetHandle() const
+    virtual void* GetHandle() const wxOVERRIDE
         { return m_dc.GetHandle(); }
 
 protected:
@@ -100,30 +100,30 @@ protected:
 
     // wxDCBase functions
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE)
+                             wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE
     {
         return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style);
     }
 
-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const wxOVERRIDE
     {
         return m_dc.DoGetPixel(GetX(x, y), GetY(x, y), col);
     }
 
 
-    virtual void DoDrawPoint(wxCoord x, wxCoord y)
+    virtual void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE
     {
         m_dc.DoDrawPoint(GetX(x, y), GetY(x, y));
     }
 
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE
     {
         m_dc.DoDrawLine(GetX(x1, y1), GetY(x1, y1), GetX(x2, y2), GetY(x2, y2));
     }
 
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
                            wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc)
+                           wxCoord xc, wxCoord yc) wxOVERRIDE
     {
         wxFAIL_MSG( wxT("this is probably wrong") );
 
@@ -133,14 +133,14 @@ protected:
     }
 
     virtual void DoDrawCheckMark(wxCoord x, wxCoord y,
-                                 wxCoord w, wxCoord h)
+                                 wxCoord w, wxCoord h) wxOVERRIDE
     {
         m_dc.DoDrawCheckMark(GetX(x, y), GetY(x, y),
                              GetX(w, h), GetY(w, h));
     }
 
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                   double sa, double ea)
+                                   double sa, double ea) wxOVERRIDE
     {
         wxFAIL_MSG( wxT("this is probably wrong") );
 
@@ -149,49 +149,49 @@ protected:
                                sa, ea);
     }
 
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE
     {
         m_dc.DoDrawRectangle(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h));
     }
 
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                         wxCoord w, wxCoord h,
-                                        double radius)
+                                        double radius) wxOVERRIDE
     {
         m_dc.DoDrawRoundedRectangle(GetX(x, y), GetY(x, y),
                                     GetX(w, h), GetY(w, h),
                                     radius);
     }
 
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE
     {
         m_dc.DoDrawEllipse(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h));
     }
 
-    virtual void DoCrossHair(wxCoord x, wxCoord y)
+    virtual void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE
     {
         m_dc.DoCrossHair(GetX(x, y), GetY(x, y));
     }
 
-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y)
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE
     {
         m_dc.DoDrawIcon(icon, GetX(x, y), GetY(x, y));
     }
 
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = false)
+                              bool useMask = false) wxOVERRIDE
     {
         m_dc.DoDrawBitmap(bmp, GetX(x, y), GetY(x, y), useMask);
     }
 
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y)
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE
     {
         // this is never mirrored
         m_dc.DoDrawText(text, x, y);
     }
 
     virtual void DoDrawRotatedText(const wxString& text,
-                                   wxCoord x, wxCoord y, double angle)
+                                   wxCoord x, wxCoord y, double angle) wxOVERRIDE
     {
         // this is never mirrored
         m_dc.DoDrawRotatedText(text, x, y, angle);
@@ -202,7 +202,7 @@ protected:
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
                         wxRasterOperationMode rop = wxCOPY,
                         bool useMask = false,
-                        wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
+                        wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE
     {
         return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest),
                            GetX(w, h), GetY(w, h),
@@ -211,18 +211,18 @@ protected:
                            GetX(xsrcMask, ysrcMask), GetX(xsrcMask, ysrcMask));
     }
 
-    virtual void DoGetSize(int *w, int *h) const
+    virtual void DoGetSize(int *w, int *h) const wxOVERRIDE
     {
         m_dc.DoGetSize(GetX(w, h), GetY(w, h));
     }
 
-    virtual void DoGetSizeMM(int *w, int *h) const
+    virtual void DoGetSizeMM(int *w, int *h) const wxOVERRIDE
     {
         m_dc.DoGetSizeMM(GetX(w, h), GetY(w, h));
     }
 
     virtual void DoDrawLines(int n, const wxPoint points[],
-                             wxCoord xoffset, wxCoord yoffset)
+                             wxCoord xoffset, wxCoord yoffset) wxOVERRIDE
     {
         wxPoint* points_alloc = Mirror(n, points);
 
@@ -234,7 +234,7 @@ protected:
 
     virtual void DoDrawPolygon(int n, const wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
-                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE)
+                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE
     {
         wxPoint* points_alloc = Mirror(n, points);
 
@@ -245,13 +245,13 @@ protected:
         delete[] points_alloc;
     }
 
-    virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))
+    virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE
     {
         wxFAIL_MSG( wxT("not implemented") );
     }
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord w, wxCoord h)
+                                     wxCoord w, wxCoord h) wxOVERRIDE
     {
         m_dc.DoSetClippingRegion(GetX(x, y), GetY(x, y), GetX(w, h), GetY(w, h));
     }
@@ -260,7 +260,7 @@ protected:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const
+                                 const wxFont *theFont = NULL) const wxOVERRIDE
     {
         // never mirrored
         m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont);

include/wx/dcprint.h

@@ -28,7 +28,7 @@ public:
     wxPrinterDC(const wxPrintData& data);
 
     wxRect GetPaperRect() const;
-    int GetResolution() const;
+    int GetResolution() const wxOVERRIDE;
 
 protected:
     wxPrinterDC(wxDCImpl *impl) : wxDC(impl) { }

include/wx/dcsvg.h

@@ -49,7 +49,7 @@ class WXDLLIMPEXP_CORE wxSVGBitmapFileHandler : public wxSVGBitmapHandler
 public:
     virtual bool ProcessBitmap(const wxBitmap& bitmap,
                                wxCoord x, wxCoord y,
-                               wxOutputStream& stream) const;
+                               wxOutputStream& stream) const wxOVERRIDE;
 };
 
 // Predefined handler which embeds the bitmap (base64-encoding it) inside the
@@ -59,7 +59,7 @@ class WXDLLIMPEXP_CORE wxSVGBitmapEmbedHandler : public wxSVGBitmapHandler
 public:
     virtual bool ProcessBitmap(const wxBitmap& bitmap,
                                wxCoord x, wxCoord y,
-                               wxOutputStream& stream) const;
+                               wxOutputStream& stream) const wxOVERRIDE;
 };
 
 class WXDLLIMPEXP_CORE wxSVGFileDCImpl : public wxDCImpl
@@ -70,26 +70,26 @@ public:
 
     virtual ~wxSVGFileDCImpl();
 
-    bool IsOk() const { return m_OK; }
+    bool IsOk() const wxOVERRIDE { return m_OK; }
 
-    virtual bool CanDrawBitmap() const { return true; }
+    virtual bool CanDrawBitmap() const wxOVERRIDE { return true; }
-    virtual bool CanGetTextExtent() const { return true; }
+    virtual bool CanGetTextExtent() const wxOVERRIDE { return true; }
 
-    virtual int GetDepth() const
+    virtual int GetDepth() const wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::GetDepth Call not implemented"));
         return -1;
     }
 
-    virtual void Clear()
+    virtual void Clear() wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::Clear() Call not implemented \nNot sensible for an output file?"));
     }
 
-    virtual void DestroyClippingRegion();
+    virtual void DestroyClippingRegion() wxOVERRIDE;
 
-    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharHeight() const wxOVERRIDE;
-    virtual wxCoord GetCharWidth() const;
+    virtual wxCoord GetCharWidth() const wxOVERRIDE;
 
     virtual void SetClippingRegion(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
                                    wxCoord WXUNUSED(w), wxCoord WXUNUSED(h))
@@ -97,7 +97,7 @@ public:
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetClippingRegion not implemented"));
     }
 
-    virtual void SetPalette(const wxPalette&  WXUNUSED(palette))
+    virtual void SetPalette(const wxPalette&  WXUNUSED(palette)) wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetPalette not implemented"));
     }
@@ -108,29 +108,29 @@ public:
         wxFAIL_MSG(wxT("wxSVGFILEDC::GetClippingBox not implemented"));
     }
 
-    virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
+    virtual void SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::SetLogicalFunction Call not implemented"));
     }
 
-    virtual wxRasterOperationMode GetLogicalFunction() const
+    virtual wxRasterOperationMode GetLogicalFunction() const wxOVERRIDE
     {
         wxFAIL_MSG(wxT("wxSVGFILEDC::GetLogicalFunction() not implemented"));
         return wxCOPY;
     }
 
-    virtual void SetBackground( const wxBrush &brush );
+    virtual void SetBackground( const wxBrush &brush ) wxOVERRIDE;
-    virtual void SetBackgroundMode( int mode );
+    virtual void SetBackgroundMode( int mode ) wxOVERRIDE;
-    virtual void SetBrush(const wxBrush& brush);
+    virtual void SetBrush(const wxBrush& brush) wxOVERRIDE;
-    virtual void SetFont(const wxFont& font);
+    virtual void SetFont(const wxFont& font) wxOVERRIDE;
-    virtual void SetPen(const wxPen& pen);
+    virtual void SetPen(const wxPen& pen) wxOVERRIDE;
 
-    virtual void* GetHandle() const { return NULL; }
+    virtual void* GetHandle() const wxOVERRIDE { return NULL; }
 
     void SetBitmapHandler(wxSVGBitmapHandler* handler);
 
 private:
-   virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const
+   virtual bool DoGetPixel(wxCoord, wxCoord, wxColour *) const wxOVERRIDE
    {
        wxFAIL_MSG(wxT("wxSVGFILEDC::DoGetPixel Call not implemented"));
        return true;
@@ -138,57 +138,57 @@ private:
 
    virtual bool DoBlit(wxCoord, wxCoord, wxCoord, wxCoord, wxDC *,
                        wxCoord, wxCoord, wxRasterOperationMode = wxCOPY,
-                       bool = 0, int = -1, int = -1);
+                       bool = 0, int = -1, int = -1) wxOVERRIDE;
 
-   virtual void DoCrossHair(wxCoord, wxCoord)
+   virtual void DoCrossHair(wxCoord, wxCoord) wxOVERRIDE
    {
        wxFAIL_MSG(wxT("wxSVGFILEDC::CrossHair Call not implemented"));
    }
 
-   virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
+   virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord) wxOVERRIDE;
 
-   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false);
+   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false) wxOVERRIDE;
 
-   virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+   virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;
 
-   virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+   virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;
 
    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                  double sa, double ea);
+                                  double sa, double ea) wxOVERRIDE;
 
-   virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord);
+   virtual void DoDrawIcon(const wxIcon &, wxCoord, wxCoord) wxOVERRIDE;
 
-   virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+   virtual void DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
 
    virtual void DoDrawLines(int n, const wxPoint points[],
-                            wxCoord xoffset = 0, wxCoord yoffset = 0);
+                            wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE;
 
-   virtual void DoDrawPoint(wxCoord, wxCoord);
+   virtual void DoDrawPoint(wxCoord, wxCoord) wxOVERRIDE;
 
    virtual void DoDrawPolygon(int n, const wxPoint points[],
                               wxCoord xoffset, wxCoord yoffset,
-                              wxPolygonFillMode fillStyle);
+                              wxPolygonFillMode fillStyle) wxOVERRIDE;
 
-   virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
+   virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h) wxOVERRIDE;
 
    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
-                                  double angle);
+                                  double angle) wxOVERRIDE;
 
    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
                                        wxCoord w, wxCoord h,
-                                       double radius = 20) ;
+                                       double radius = 20) wxOVERRIDE ;
 
-   virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+   virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
 
    virtual bool DoFloodFill(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
                             const wxColour& WXUNUSED(col),
-                            wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE)
+                            wxFloodFillStyle WXUNUSED(style) = wxFLOOD_SURFACE) wxOVERRIDE
    {
        wxFAIL_MSG(wxT("wxSVGFILEDC::DoFloodFill Call not implemented"));
        return false;
    }
 
-   virtual void DoGetSize(int * x, int *y) const
+   virtual void DoGetSize(int * x, int *y) const wxOVERRIDE
    {
        if ( x )
            *x = m_width;
@@ -199,18 +199,18 @@ private:
    virtual void DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h,
                                 wxCoord *descent = NULL,
                                 wxCoord *externalLeading = NULL,
-                                const wxFont *font = NULL) const;
+                                const wxFont *font = NULL) const wxOVERRIDE;
 
-   virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))
+   virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region)) wxOVERRIDE
    {
        wxFAIL_MSG(wxT("wxSVGFILEDC::DoSetDeviceClippingRegion not yet implemented"));
    }
 
-   virtual void DoSetClippingRegion(int x,  int y, int width, int height);
+   virtual void DoSetClippingRegion(int x,  int y, int width, int height) wxOVERRIDE;
 
-   virtual void DoGetSizeMM( int *width, int *height ) const;
+   virtual void DoGetSizeMM( int *width, int *height ) const wxOVERRIDE;
 
-   virtual wxSize GetPPI() const;
+   virtual wxSize GetPPI() const wxOVERRIDE;
 
    void Init (const wxString &filename, int width, int height, double dpi);
 

include/wx/debugrpt.h

@@ -146,7 +146,7 @@ public:
     const wxString& GetCompressedFileName() const { return m_zipfile; }
 
 protected:
-    virtual bool DoProcess();
+    virtual bool DoProcess() wxOVERRIDE;
 
 private:
     // user-specified file directory/base name, use defaults if empty
@@ -176,7 +176,7 @@ public:
                         const wxString& curl = wxT("curl"));
 
 protected:
-    virtual bool DoProcess();
+    virtual bool DoProcess() wxOVERRIDE;
 
     // this function may be overridden in a derived class to show the output
     // from curl: this may be an HTML page or anything else that the server
@@ -237,7 +237,7 @@ class WXDLLIMPEXP_QA wxDebugReportPreviewStd : public wxDebugReportPreview
 public:
     wxDebugReportPreviewStd() { }
 
-    virtual bool Show(wxDebugReport& dbgrpt) const;
+    virtual bool Show(wxDebugReport& dbgrpt) const wxOVERRIDE;
 };
 
 #endif // wxUSE_GUI

include/wx/dialog.h

@@ -309,10 +309,10 @@ public:
 // Overrides
 
     // Indicate that adaptation should be done
-    virtual bool CanDoLayoutAdaptation(wxDialog* dialog);
+    virtual bool CanDoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE;
 
     // Do layout adaptation
-    virtual bool DoLayoutAdaptation(wxDialog* dialog);
+    virtual bool DoLayoutAdaptation(wxDialog* dialog) wxOVERRIDE;
 
 // Implementation
 
@@ -381,7 +381,7 @@ public:
     int GetReturnCode() const
         { return GetDialog()->GetReturnCode(); }
 
-    virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowModalDialogEvent (*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowModalDialogEvent )

include/wx/dnd.h

@@ -239,7 +239,7 @@ public:
 
     virtual bool OnDropText(wxCoord x, wxCoord y, const wxString& text) = 0;
 
-    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxTextDropTarget);
@@ -255,7 +255,7 @@ public:
     virtual bool OnDropFiles(wxCoord x, wxCoord y,
                              const wxArrayString& filenames) = 0;
 
-    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) wxOVERRIDE;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxFileDropTarget);

include/wx/docview.h

@@ -284,7 +284,7 @@ public:
 
 protected:
     // hook the document into event handlers chain here
-    virtual bool TryBefore(wxEvent& event);
+    virtual bool TryBefore(wxEvent& event) wxOVERRIDE;
 
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;
@@ -548,7 +548,7 @@ protected:
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
     // hook the currently active view into event handlers chain here
-    virtual bool TryBefore(wxEvent& event);
+    virtual bool TryBefore(wxEvent& event) wxOVERRIDE;
 
     // return the command processor for the current document, if any
     wxCommandProcessor *GetCurrentCommandProcessor() const;
@@ -983,11 +983,11 @@ public:
     wxDocPrintout(wxView *view = NULL, const wxString& title = wxString());
 
     // implement wxPrintout methods
-    virtual bool OnPrintPage(int page);
+    virtual bool OnPrintPage(int page) wxOVERRIDE;
-    virtual bool HasPage(int page);
+    virtual bool HasPage(int page) wxOVERRIDE;
-    virtual bool OnBeginDocument(int startPage, int endPage);
+    virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE;
     virtual void GetPageInfo(int *minPage, int *maxPage,
-                             int *selPageFrom, int *selPageTo);
+                             int *selPageFrom, int *selPageTo) wxOVERRIDE;
 
     virtual wxView *GetView() { return m_printoutView; }
 

include/wx/event.h

@@ -223,9 +223,9 @@ public:
         : m_handler( handler ), m_method( method )
         { }
 
-    virtual void operator()(wxEvtHandler *handler, wxEvent& event);
+    virtual void operator()(wxEvtHandler *handler, wxEvent& event) wxOVERRIDE;
 
-    virtual bool IsMatching(const wxEventFunctor& functor) const
+    virtual bool IsMatching(const wxEventFunctor& functor) const wxOVERRIDE
     {
         if ( wxTypeId(functor) == wxTypeId(*this) )
         {
@@ -245,10 +245,10 @@ public:
             return false;
     }
 
-    virtual wxEvtHandler *GetEvtHandler() const
+    virtual wxEvtHandler *GetEvtHandler() const wxOVERRIDE
         { return m_handler; }
 
-    virtual wxEventFunction GetEvtMethod() const
+    virtual wxEventFunction GetEvtMethod() const wxOVERRIDE
         { return m_method; }
 
 private:
@@ -459,7 +459,7 @@ public:
         CheckHandlerArgument(static_cast<EventClass *>(NULL));
     }
 
-    virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event)
+    virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE
     {
         // If you get an error here like "must use .* or ->* to call
         // pointer-to-member function" then you probably tried to call
@@ -471,7 +471,7 @@ public:
         m_handler(static_cast<EventArg&>(event));
     }
 
-    virtual bool IsMatching(const wxEventFunctor &functor) const
+    virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE
     {
         if ( wxTypeId(functor) != wxTypeId(*this) )
             return false;
@@ -504,7 +504,7 @@ public:
         : m_handler(handler), m_handlerAddr(&handler)
         { }
 
-    virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event)
+    virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) wxOVERRIDE
     {
         // If you get an error here like "must use '.*' or '->*' to call
         // pointer-to-member function" then you probably tried to call
@@ -516,7 +516,7 @@ public:
         m_handler(static_cast<EventArg&>(event));
     }
 
-    virtual bool IsMatching(const wxEventFunctor &functor) const
+    virtual bool IsMatching(const wxEventFunctor &functor) const wxOVERRIDE
     {
         if ( wxTypeId(functor) != wxTypeId(*this) )
             return false;
@@ -1261,7 +1261,7 @@ public:
     void RequestMore(bool needMore = true) { m_requestMore = needMore; }
     bool MoreRequested() const { return m_requestMore; }
 
-    virtual wxEvent *Clone() const { return new wxIdleEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxIdleEvent(*this); }
 
     // Specify how wxWidgets will send idle events: to
     // all windows, or only to those which specify that they
@@ -1299,14 +1299,14 @@ public:
         SetString(GetString().Clone());
     }
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxThreadEvent(*this);
     }
 
     // this is important to avoid that calling wxEventLoopBase::YieldFor thread events
     // gets processed when this is unwanted:
-    virtual wxEventCategory GetEventCategory() const
+    virtual wxEventCategory GetEventCategory() const wxOVERRIDE
         { return wxEVT_CATEGORY_THREAD; }
 
 private:
@@ -1363,12 +1363,12 @@ public:
     {
     }
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxAsyncMethodCallEvent0(*this);
     }
 
-    virtual void Execute()
+    virtual void Execute() wxOVERRIDE
     {
         (m_object->*m_method)();
     }
@@ -1405,12 +1405,12 @@ public:
     {
     }
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxAsyncMethodCallEvent1(*this);
     }
 
-    virtual void Execute()
+    virtual void Execute() wxOVERRIDE
     {
         (m_object->*m_method)(m_param1);
     }
@@ -1452,12 +1452,12 @@ public:
     {
     }
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxAsyncMethodCallEvent2(*this);
     }
 
-    virtual void Execute()
+    virtual void Execute() wxOVERRIDE
     {
         (m_object->*m_method)(m_param1, m_param2);
     }
@@ -1488,12 +1488,12 @@ public:
     {
     }
 
-    virtual wxEvent *Clone() const
+    virtual wxEvent *Clone() const wxOVERRIDE
     {
         return new wxAsyncMethodCallEventFunctor(*this);
     }
 
-    virtual void Execute()
+    virtual void Execute() wxOVERRIDE
     {
         m_fn();
     }
@@ -1566,8 +1566,8 @@ public:
     // true if the listbox event was a selection.
     bool IsSelection() const { return (m_extraLong != 0); }
 
-    virtual wxEvent *Clone() const { return new wxCommandEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCommandEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
+    virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; }
 
 protected:
     void*             m_clientData;    // Arbitrary client data
@@ -1599,7 +1599,7 @@ public:
     // for implementation code only: is the operation allowed?
     bool IsAllowed() const { return m_bAllow; }
 
-    virtual wxEvent *Clone() const { return new wxNotifyEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxNotifyEvent(*this); }
 
 private:
     bool m_bAllow;
@@ -1634,7 +1634,7 @@ public:
     void SetOrientation(int orient) { m_extraLong = (long) orient; }
     void SetPosition(int pos) { m_commandInt = pos; }
 
-    virtual wxEvent *Clone() const { return new wxScrollEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent)
@@ -1667,7 +1667,7 @@ public:
     void SetOrientation(int orient) { m_extraLong = (long) orient; }
     void SetPosition(int pos) { m_commandInt = pos; }
 
-    virtual wxEvent *Clone() const { return new wxScrollWinEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxScrollWinEvent(*this); }
 
 protected:
     int               m_commandInt;
@@ -1805,8 +1805,8 @@ public:
     // Is the system set to do page scrolling?
     bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); }
 
-    virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
+    virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; }
 
     wxMouseEvent& operator=(const wxMouseEvent& event)
     {
@@ -1859,7 +1859,7 @@ public:
     const wxCursor& GetCursor() const { return m_cursor; }
     bool HasCursor() const { return m_cursor.IsOk(); }
 
-    virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxSetCursorEvent(*this); }
 
 private:
     wxCoord  m_x, m_y;
@@ -1971,8 +1971,8 @@ public:
     bool IsNextEventAllowed() const { return m_allowNext; }
 
 
-    virtual wxEvent *Clone() const { return new wxKeyEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxKeyEvent(*this); }
-    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }
+    virtual wxEventCategory GetEventCategory() const wxOVERRIDE { return wxEVT_CATEGORY_USER_INPUT; }
 
     // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for
     // example)
@@ -2080,7 +2080,7 @@ public:
     wxRect GetRect() const { return m_rect; }
     void SetRect(const wxRect& rect) { m_rect = rect; }
 
-    virtual wxEvent *Clone() const { return new wxSizeEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxSizeEvent(*this); }
 
 public:
     // For internal usage only. Will be converted to protected members.
@@ -2120,7 +2120,7 @@ public:
     wxRect GetRect() const { return m_rect; }
     void SetRect(const wxRect& rect) { m_rect = rect; }
 
-    virtual wxEvent *Clone() const { return new wxMoveEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxMoveEvent(*this); }
 
 protected:
     wxPoint m_pos;
@@ -2170,7 +2170,7 @@ public:
     }
 #endif // debug
 
-    virtual wxEvent *Clone() const { return new wxPaintEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaintEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent)
@@ -2183,7 +2183,7 @@ public:
         : wxEvent(winid, wxEVT_NC_PAINT)
         { }
 
-    virtual wxEvent *Clone() const { return new wxNcPaintEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxNcPaintEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent)
@@ -2209,7 +2209,7 @@ public:
 
     wxDC *GetDC() const { return m_dc; }
 
-    virtual wxEvent *Clone() const { return new wxEraseEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxEraseEvent(*this); }
 
 protected:
     wxDC *m_dc;
@@ -2241,7 +2241,7 @@ public:
     wxWindow *GetWindow() const { return m_win; }
     void SetWindow(wxWindow *win) { m_win = win; }
 
-    virtual wxEvent *Clone() const { return new wxFocusEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxFocusEvent(*this); }
 
 private:
     wxWindow *m_win;
@@ -2259,7 +2259,7 @@ public:
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 
-    virtual wxEvent *Clone() const { return new wxChildFocusEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxChildFocusEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent)
@@ -2300,7 +2300,7 @@ public:
     bool GetActive() const { return m_active; }
     Reason GetActivationReason() const { return m_activationReason;}
 
-    virtual wxEvent *Clone() const { return new wxActivateEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxActivateEvent(*this); }
 
 private:
     bool m_active;
@@ -2322,7 +2322,7 @@ public:
         : wxEvent(Id, wxEVT_INIT_DIALOG)
         { }
 
-    virtual wxEvent *Clone() const { return new wxInitDialogEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxInitDialogEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent)
@@ -2354,7 +2354,7 @@ public:
     // only for wxEVT_MENU_OPEN/CLOSE
     wxMenu* GetMenu() const { return m_menu; }
 
-    virtual wxEvent *Clone() const { return new wxMenuEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxMenuEvent(*this); }
 
 private:
     int     m_menuId;
@@ -2408,7 +2408,7 @@ public:
     bool CanVeto() const { return m_canVeto; }
     bool GetVeto() const { return m_canVeto && m_veto; }
 
-    virtual wxEvent *Clone() const { return new wxCloseEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCloseEvent(*this); }
 
 protected:
     bool m_loggingOff,
@@ -2442,7 +2442,7 @@ public:
     wxDEPRECATED( bool GetShow() const { return IsShown(); } )
 #endif
 
-    virtual wxEvent *Clone() const { return new wxShowEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxShowEvent(*this); }
 
 protected:
     bool m_show;
@@ -2471,7 +2471,7 @@ public:
     // return true if the frame was iconized, false if restored
     bool IsIconized() const { return m_iconized; }
 
-    virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxIconizeEvent(*this); }
 
 protected:
     bool m_iconized;
@@ -2490,7 +2490,7 @@ public:
         : wxEvent(winid, wxEVT_MAXIMIZE)
         { }
 
-    virtual wxEvent *Clone() const { return new wxMaximizeEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxMaximizeEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent)
@@ -2589,7 +2589,7 @@ public:
     { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) ||
             ((m_buttonState & but) == but)); }
 
-    virtual wxEvent *Clone() const { return new wxJoystickEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxJoystickEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent)
@@ -2639,7 +2639,7 @@ public:
     int GetNumberOfFiles() const { return m_noFiles; }
     wxString *GetFiles() const { return m_files; }
 
-    virtual wxEvent *Clone() const { return new wxDropFilesEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxDropFilesEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent)
@@ -2726,7 +2726,7 @@ public:
     // Returns the UI update mode
     static wxUpdateUIMode GetMode() { return sm_updateMode; }
 
-    virtual wxEvent *Clone() const { return new wxUpdateUIEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxUpdateUIEvent(*this); }
 
 protected:
     bool          m_checked;
@@ -2759,7 +2759,7 @@ public:
         : wxEvent(0, wxEVT_SYS_COLOUR_CHANGED)
         { }
 
-    virtual wxEvent *Clone() const { return new wxSysColourChangedEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxSysColourChangedEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent)
@@ -2784,7 +2784,7 @@ public:
           m_gainedCapture(event.m_gainedCapture)
         { }
 
-    virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureChangedEvent(*this); }
 
     wxWindow* GetCapturedWindow() const { return m_gainedCapture; }
 
@@ -2812,7 +2812,7 @@ public:
         : wxEvent(event)
     {}
 
-    virtual wxEvent *Clone() const { return new wxMouseCaptureLostEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxMouseCaptureLostEvent(*this); }
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent)
 };
@@ -2830,7 +2830,7 @@ public:
         : wxEvent(0, wxEVT_DISPLAY_CHANGED)
         { }
 
-    virtual wxEvent *Clone() const { return new wxDisplayChangedEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxDisplayChangedEvent(*this); }
 };
 
 /*
@@ -2853,7 +2853,7 @@ public:
     void SetChangedWindow(wxWindow* win) { m_changedWindow = win; }
     wxWindow* GetChangedWindow() const { return m_changedWindow; }
 
-    virtual wxEvent *Clone() const { return new wxPaletteChangedEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxPaletteChangedEvent(*this); }
 
 protected:
     wxWindow*     m_changedWindow;
@@ -2883,7 +2883,7 @@ public:
     void SetPaletteRealized(bool realized) { m_paletteRealized = realized; }
     bool GetPaletteRealized() const { return m_paletteRealized; }
 
-    virtual wxEvent *Clone() const { return new wxQueryNewPaletteEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryNewPaletteEvent(*this); }
 
 protected:
     bool m_paletteRealized;
@@ -2942,7 +2942,7 @@ public:
     // Set flags
     void SetFlags(long flags) { m_flags = flags; }
 
-    virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxNavigationKeyEvent(*this); }
 
     enum wxNavigationKeyEventFlags
     {
@@ -2976,7 +2976,7 @@ public:
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 
-    virtual wxEvent *Clone() const { return new wxWindowCreateEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowCreateEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent)
@@ -2989,7 +2989,7 @@ public:
 
     wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); }
 
-    virtual wxEvent *Clone() const { return new wxWindowDestroyEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxWindowDestroyEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent)
@@ -3040,7 +3040,7 @@ public:
     const wxString& GetTarget() const { return m_target; }
     void SetTarget(const wxString& target) { m_target = target; }
 
-    virtual wxEvent *Clone() const { return new wxHelpEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxHelpEvent(*this); }
 
     // optional indication of the event source
     Origin GetOrigin() const { return m_origin; }
@@ -3082,7 +3082,7 @@ public:
         : wxCommandEvent(event)
     { }
 
-    virtual wxEvent *Clone() const { return new wxClipboardTextEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxClipboardTextEvent(*this); }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent)
@@ -3114,7 +3114,7 @@ public:
     const wxPoint& GetPosition() const { return m_pos; }
     void SetPosition(const wxPoint& pos) { m_pos = pos; }
 
-    virtual wxEvent *Clone() const { return new wxContextMenuEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxContextMenuEvent(*this); }
 
 protected:
     wxPoint   m_pos;
@@ -3775,14 +3775,14 @@ public:
     }
 
     // The sink is being destroyed
-    virtual void OnObjectDestroy( )
+    virtual void OnObjectDestroy( ) wxOVERRIDE
     {
         if ( m_src )
             m_src->OnSinkDestroyed( m_sink );
         delete this;
     }
 
-    virtual wxEventConnectionRef *ToEventConnection() { return this; }
+    virtual wxEventConnectionRef *ToEventConnection() wxOVERRIDE { return this; }
 
     void IncRef() { m_refCount++; }
     void DecRef()
@@ -3855,7 +3855,7 @@ public:
         m_eventsToBlock.push_back(type);
     }
 
-    virtual bool ProcessEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
 
 protected:
     wxArrayInt m_eventsToBlock;
@@ -3986,9 +3986,9 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
         static const wxEventTableEntry sm_eventTableEntries[];          \
     protected:                                                          \
         static const wxEventTable        sm_eventTable;                 \
-        virtual const wxEventTable*      GetEventTable() const;         \
+        const wxEventTable* GetEventTable() const wxOVERRIDE;           \
         static wxEventHashTable          sm_eventHashTable;             \
-        virtual wxEventHashTable&        GetEventHashTable() const
+        wxEventHashTable& GetEventHashTable() const wxOVERRIDE
 
 // N.B.: when building DLL with Borland C++ 5.5 compiler, you must initialize
 //       sm_eventTable before using it in GetEventTable() or the compiler gives

include/wx/evtloop.h

@@ -238,12 +238,12 @@ public:
 
     // sets the "should exit" flag and wakes up the loop so that it terminates
     // soon
-    virtual void ScheduleExit(int rc = 0);
+    virtual void ScheduleExit(int rc = 0) wxOVERRIDE;
 
 protected:
     // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
     // terminating when Exit() is called
-    virtual int DoRun();
+    virtual int DoRun() wxOVERRIDE;
 
     // may be overridden to perform some action at the start of each new event
     // loop iteration
@@ -377,7 +377,7 @@ public:
     }
 
 protected:
-    virtual void OnExit()
+    virtual void OnExit() wxOVERRIDE
     {
         delete m_windowDisabler;
         m_windowDisabler = NULL;

include/wx/fdrepdlg.h

@@ -156,7 +156,7 @@ public:
     void SetFindString(const wxString& str) { SetString(str); }
     void SetReplaceString(const wxString& str) { m_strReplace = str; }
 
-    virtual wxEvent *Clone() const { return new wxFindDialogEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxFindDialogEvent(*this); }
 
 private:
     wxString m_strReplace;

include/wx/fileconf.h

@@ -151,28 +151,28 @@ public:
 #endif // __UNIX__/!__UNIX__
 
   // implement inherited pure virtual functions
-  virtual void SetPath(const wxString& strPath);
+  virtual void SetPath(const wxString& strPath) wxOVERRIDE;
-  virtual const wxString& GetPath() const;
+  virtual const wxString& GetPath() const wxOVERRIDE;
 
-  virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
+  virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE;
-  virtual bool GetNextGroup (wxString& str, long& lIndex) const;
+  virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE;
-  virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
+  virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE;
-  virtual bool GetNextEntry (wxString& str, long& lIndex) const;
+  virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE;
 
-  virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
+  virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE;
-  virtual size_t GetNumberOfGroups(bool bRecursive = false) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE;
 
-  virtual bool HasGroup(const wxString& strName) const;
+  virtual bool HasGroup(const wxString& strName) const wxOVERRIDE;
-  virtual bool HasEntry(const wxString& strName) const;
+  virtual bool HasEntry(const wxString& strName) const wxOVERRIDE;
 
-  virtual bool Flush(bool bCurrentOnly = false);
+  virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE;
 
-  virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
+  virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE;
-  virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
+  virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE;
 
-  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true);
+  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE;
-  virtual bool DeleteGroup(const wxString& szKey);
+  virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE;
-  virtual bool DeleteAll();
+  virtual bool DeleteAll() wxOVERRIDE;
 
   // additional, wxFileConfig-specific, functionality
 #if wxUSE_STREAMS
@@ -191,16 +191,16 @@ public:
   bool      LineListIsEmpty();
 
 protected:
-  virtual bool DoReadString(const wxString& key, wxString *pStr) const;
+  virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE;
-  virtual bool DoReadLong(const wxString& key, long *pl) const;
+  virtual bool DoReadLong(const wxString& key, long *pl) const wxOVERRIDE;
 #if wxUSE_BASE64
-  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
+  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE;
 #endif // wxUSE_BASE64
 
-  virtual bool DoWriteString(const wxString& key, const wxString& szValue);
+  virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE;
-  virtual bool DoWriteLong(const wxString& key, long lValue);
+  virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE;
 #if wxUSE_BASE64
-  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
+  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE;
 #endif // wxUSE_BASE64
 
 private:

include/wx/filectrl.h

@@ -98,7 +98,7 @@ public:
     }
 
     // no need for the copy constructor as the default one will be fine.
-    virtual wxEvent *Clone() const { return new wxFileCtrlEvent( *this ); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxFileCtrlEvent( *this ); }
 
     void SetFiles( const wxArrayString &files ) { m_files = files; }
     void SetDirectory( const wxString &directory ) { m_directory = directory; }

include/wx/filepicker.h

@@ -50,7 +50,7 @@ public:
     void SetPath(const wxString &p) { m_path = p; }
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxFileDirPickerEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxFileDirPickerEvent(*this); }
 
 private:
     wxString m_path;
@@ -176,8 +176,8 @@ public:         // public API
 
 public:        // internal functions
 
-    void UpdatePickerFromTextCtrl();
+    void UpdatePickerFromTextCtrl() wxOVERRIDE;
-    void UpdateTextCtrlFromPicker();
+    void UpdateTextCtrlFromPicker() wxOVERRIDE;
 
     // event handler for our picker
     void OnFileDirChange(wxFileDirPickerEvent &);
@@ -267,15 +267,15 @@ public:
 public:     // overrides
 
     // return the text control value in canonical form
-    wxString GetTextCtrlValue() const;
+    wxString GetTextCtrlValue() const wxOVERRIDE;
 
-    bool IsCwdToUpdate() const
+    bool IsCwdToUpdate() const wxOVERRIDE
         { return HasFlag(wxFLP_CHANGE_DIR); }
 
-    wxEventType GetEventType() const
+    wxEventType GetEventType() const wxOVERRIDE
         { return wxEVT_FILEPICKER_CHANGED; }
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink )
+    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE
     {
         sender->Connect( wxEVT_FILEPICKER_CHANGED,
             wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
@@ -288,7 +288,7 @@ protected:
     wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent,
                                             const wxString& path,
                                             const wxString& message,
-                                            const wxString& wildcard)
+                                            const wxString& wildcard) wxOVERRIDE
     {
         return new wxFilePickerWidget(parent, wxID_ANY,
                                       wxGetTranslation(wxFilePickerWidgetLabel),
@@ -298,7 +298,7 @@ protected:
     }
 
     // extracts the style for our picker from wxFileDirPickerCtrlBase's style
-    long GetPickerStyle(long style) const
+    long GetPickerStyle(long style) const wxOVERRIDE
     {
         return style & (wxFLP_OPEN |
                         wxFLP_SAVE |
@@ -367,15 +367,15 @@ public:
 
 public:     // overrides
 
-    wxString GetTextCtrlValue() const;
+    wxString GetTextCtrlValue() const wxOVERRIDE;
 
-    bool IsCwdToUpdate() const
+    bool IsCwdToUpdate() const wxOVERRIDE
         { return HasFlag(wxDIRP_CHANGE_DIR); }
 
-    wxEventType GetEventType() const
+    wxEventType GetEventType() const wxOVERRIDE
         { return wxEVT_DIRPICKER_CHANGED; }
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink )
+    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE
     {
         sender->Connect( wxEVT_DIRPICKER_CHANGED,
             wxFileDirPickerEventHandler( wxFileDirPickerCtrlBase::OnFileDirChange ),
@@ -388,7 +388,7 @@ protected:
     wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent,
                                             const wxString& path,
                                             const wxString& message,
-                                            const wxString& WXUNUSED(wildcard))
+                                            const wxString& WXUNUSED(wildcard)) wxOVERRIDE
     {
         return new wxDirPickerWidget(parent, wxID_ANY,
                                      wxGetTranslation(wxDirPickerWidgetLabel),
@@ -398,7 +398,7 @@ protected:
     }
 
     // extracts the style for our picker from wxFileDirPickerCtrlBase's style
-    long GetPickerStyle(long style) const
+    long GetPickerStyle(long style) const wxOVERRIDE
     {
         return style & (wxDIRP_DIR_MUST_EXIST |
                         wxDIRP_CHANGE_DIR |

include/wx/filesys.h

@@ -277,10 +277,10 @@ special characters :
 class WXDLLIMPEXP_BASE wxLocalFSHandler : public wxFileSystemHandler
 {
 public:
-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
-    virtual wxString FindFirst(const wxString& spec, int flags = 0);
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext();
+    virtual wxString FindNext() wxOVERRIDE;
 
     // wxLocalFSHandler will prefix all filenames with 'root' before accessing
     // files on disk. This effectively makes 'root' the top-level directory

include/wx/fontpicker.h

@@ -157,8 +157,8 @@ public:         // public API
 
 public:        // internal functions
 
-    void UpdatePickerFromTextCtrl();
+    void UpdatePickerFromTextCtrl() wxOVERRIDE;
-    void UpdateTextCtrlFromPicker();
+    void UpdateTextCtrlFromPicker() wxOVERRIDE;
 
     // event handler for our picker
     void OnFontChange(wxFontPickerEvent &);
@@ -170,7 +170,7 @@ public:        // internal functions
 protected:
 
     // extracts the style for our picker from wxFontPickerCtrl's style
-    long GetPickerStyle(long style) const
+    long GetPickerStyle(long style) const wxOVERRIDE
         { return (style & (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)); }
 
     // the maximum pointsize allowed to the user
@@ -205,7 +205,7 @@ public:
     void SetFont(const wxFont &c) { m_font = c; }
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxFontPickerEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxFontPickerEvent(*this); }
 
 private:
     wxFont m_font;

include/wx/frame.h

@@ -71,7 +71,7 @@ public:
 
     // get the origin of the client area (which may be different from (0, 0)
     // if the frame has a toolbar) in client coordinates
-    virtual wxPoint GetClientAreaOrigin() const;
+    virtual wxPoint GetClientAreaOrigin() const wxOVERRIDE;
 
 
     // menu bar functions
@@ -164,19 +164,19 @@ public:
 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window
-    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE;
 
     // Implement internal behaviour (menu updating on some platforms)
-    virtual void OnInternalIdle();
+    virtual void OnInternalIdle() wxOVERRIDE;
 
 #if wxUSE_MENUS || wxUSE_TOOLBAR
     // show help text for the currently selected menu or toolbar item
     // (typically in the status bar) or hide it and restore the status bar text
     // originally shown before the menu was opened if show == false
-    virtual void DoGiveHelp(const wxString& text, bool show);
+    virtual void DoGiveHelp(const wxString& text, bool show) wxOVERRIDE;
 #endif
 
-    virtual bool IsClientAreaChild(const wxWindow *child) const
+    virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE
     {
         return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
     }
@@ -190,7 +190,7 @@ protected:
     void DeleteAllBars();
 
     // test whether this window makes part of the frame
-    virtual bool IsOneOfBars(const wxWindow *win) const;
+    virtual bool IsOneOfBars(const wxWindow *win) const wxOVERRIDE;
 
 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes

include/wx/fs_arc.h

@@ -26,10 +26,10 @@ class WXDLLIMPEXP_BASE wxArchiveFSHandler : public wxFileSystemHandler
 {
 public:
     wxArchiveFSHandler();
-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
-    virtual wxString FindFirst(const wxString& spec, int flags = 0);
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext();
+    virtual wxString FindNext() wxOVERRIDE;
     void Cleanup();
     virtual ~wxArchiveFSHandler();
 

include/wx/fs_filter.h

@@ -25,11 +25,11 @@ public:
     wxFilterFSHandler() : wxFileSystemHandler() { }
     virtual ~wxFilterFSHandler() { }
 
-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
 
-    virtual wxString FindFirst(const wxString& spec, int flags = 0);
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext();
+    virtual wxString FindNext() wxOVERRIDE;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxFilterFSHandler);

include/wx/fs_inet.h

@@ -22,8 +22,8 @@
 class WXDLLIMPEXP_NET wxInternetFSHandler : public wxFileSystemHandler
 {
     public:
-        virtual bool CanOpen(const wxString& location);
+        virtual bool CanOpen(const wxString& location) wxOVERRIDE;
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
 };
 
 #endif

include/wx/fs_mem.h

@@ -49,10 +49,10 @@ public:
     // Remove file from memory FS and free occupied memory
     static void RemoveFile(const wxString& filename);
 
-    virtual bool CanOpen(const wxString& location);
+    virtual bool CanOpen(const wxString& location) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location);
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
-    virtual wxString FindFirst(const wxString& spec, int flags = 0);
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext();
+    virtual wxString FindNext() wxOVERRIDE;
 
 protected:
     // check that the given file is not already present in m_Hash; logs an

include/wx/fswatcher.h

@@ -159,7 +159,7 @@ public:
         return m_changeType;
     }
 
-    virtual wxEvent* Clone() const
+    virtual wxEvent* Clone() const wxOVERRIDE
     {
         wxFileSystemWatcherEvent* evt = new wxFileSystemWatcherEvent(*this);
         evt->m_errorMsg = m_errorMsg.Clone();
@@ -169,7 +169,7 @@ public:
         return evt;
     }
 
-    virtual wxEventCategory GetEventCategory() const
+    virtual wxEventCategory GetEventCategory() const wxOVERRIDE
     {
         // TODO this has to be merged with "similar" categories and changed
         return wxEVT_CATEGORY_UNKNOWN;

include/wx/gauge.h

@@ -79,10 +79,10 @@ public:
     virtual int GetBezelFace() const;
 
     // overridden base class virtuals
-    virtual bool AcceptsFocus() const { return false; }
+    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
 
 protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
     // the max position
     int m_rangeMax;

include/wx/gbsizer.h

@@ -291,8 +291,8 @@ public:
 
 
     // These are what make the sizer do size calculations and layout
-    virtual void RecalcSizes();
+    virtual void RecalcSizes() wxOVERRIDE;
-    virtual wxSize CalcMin();
+    virtual wxSize CalcMin() wxOVERRIDE;
 
 
     // Look at all items and see if any intersect (or would overlap) the given
@@ -317,7 +317,7 @@ public:
     virtual wxSizerItem* Insert( size_t index, wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
     virtual wxSizerItem* Insert( size_t index, wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
     virtual wxSizerItem* Insert( size_t index, int width, int height, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
-    virtual wxSizerItem* Insert( size_t index, wxSizerItem *item );
+    virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ) wxOVERRIDE;
     virtual wxSizerItem* Prepend( wxWindow *window, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
     virtual wxSizerItem* Prepend( wxSizer *sizer, int proportion = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
     virtual wxSizerItem* Prepend( int width,  int height,  int proportion = 0,  int flag = 0,  int border = 0,  wxObject* userData = NULL );

include/wx/gdiobj.h

@@ -73,12 +73,12 @@ protected:
     // replace base class functions using wxObjectRefData with our own which
     // use wxGDIRefData to ensure that we always work with data objects of the
     // correct type (i.e. derived from wxGDIRefData)
-    virtual wxObjectRefData *CreateRefData() const
+    virtual wxObjectRefData *CreateRefData() const wxOVERRIDE
     {
         return CreateGDIRefData();
     }
 
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE
     {
         return CloneGDIRefData(static_cast<const wxGDIRefData *>(data));
     }

include/wx/generic/accel.h

@@ -38,8 +38,8 @@ public:
 
 protected:
     // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
+    virtual wxObjectRefData *CreateRefData() const wxOVERRIDE;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)

include/wx/generic/buttonbar.h

@@ -47,22 +47,22 @@ public:
 
     virtual ~wxButtonToolBar();
 
-    virtual bool Realize();
+    virtual bool Realize() wxOVERRIDE;
 
-    virtual void SetToolShortHelp(int id, const wxString& helpString);
+    virtual void SetToolShortHelp(int id, const wxString& helpString) wxOVERRIDE;
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const wxOVERRIDE;
 
 protected:
     // common part of all ctors
     void Init();
 
     // implement base class pure virtuals
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool) wxOVERRIDE;
 
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable) wxOVERRIDE;
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle) wxOVERRIDE;
 
     virtual wxToolBarToolBase *CreateTool(int id,
                                           const wxString& label,
@@ -71,11 +71,11 @@ protected:
                                           wxItemKind kind,
                                           wxObject *clientData,
                                           const wxString& shortHelp,
-                                          const wxString& longHelp);
+                                          const wxString& longHelp) wxOVERRIDE;
     virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
+                                          const wxString& label) wxOVERRIDE;
 
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
 
     // calculate layout
     void DoLayout();

include/wx/generic/caret.h

@@ -25,7 +25,7 @@ class WXDLLIMPEXP_CORE wxCaretTimer : public wxTimer
 {
 public:
     wxCaretTimer(wxCaret *caret);
-    virtual void Notify();
+    virtual void Notify() wxOVERRIDE;
 
 private:
     wxCaret *m_caret;
@@ -50,17 +50,17 @@ public:
     // --------------
 
     // called by wxWindow (not using the event tables)
-    virtual void OnSetFocus();
+    virtual void OnSetFocus() wxOVERRIDE;
-    virtual void OnKillFocus();
+    virtual void OnKillFocus() wxOVERRIDE;
 
     // called by wxCaretTimer
     void OnTimer();
 
 protected:
-    virtual void DoShow();
+    virtual void DoShow() wxOVERRIDE;
-    virtual void DoHide();
+    virtual void DoHide() wxOVERRIDE;
-    virtual void DoMove();
+    virtual void DoMove() wxOVERRIDE;
-    virtual void DoSize();
+    virtual void DoSize() wxOVERRIDE;
 
     // blink the caret once
     void Blink();

include/wx/generic/dcpsg.h

@@ -51,91 +51,91 @@ public:
     virtual ~wxPostScriptDCImpl();
 
     virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const;
+    virtual bool IsOk() const wxOVERRIDE;
 
-    bool CanDrawBitmap() const { return true; }
+    bool CanDrawBitmap() const wxOVERRIDE { return true; }
 
-    void Clear();
+    void Clear() wxOVERRIDE;
-    void SetFont( const wxFont& font );
+    void SetFont( const wxFont& font ) wxOVERRIDE;
-    void SetPen( const wxPen& pen );
+    void SetPen( const wxPen& pen ) wxOVERRIDE;
-    void SetBrush( const wxBrush& brush );
+    void SetBrush( const wxBrush& brush ) wxOVERRIDE;
-    void SetLogicalFunction( wxRasterOperationMode function );
+    void SetLogicalFunction( wxRasterOperationMode function ) wxOVERRIDE;
-    void SetBackground( const wxBrush& brush );
+    void SetBackground( const wxBrush& brush ) wxOVERRIDE;
 
-    void DestroyClippingRegion();
+    void DestroyClippingRegion() wxOVERRIDE;
 
-    bool StartDoc(const wxString& message);
+    bool StartDoc(const wxString& message) wxOVERRIDE;
-    void EndDoc();
+    void EndDoc() wxOVERRIDE;
-    void StartPage();
+    void StartPage() wxOVERRIDE;
-    void EndPage();
+    void EndPage() wxOVERRIDE;
 
-    wxCoord GetCharHeight() const;
+    wxCoord GetCharHeight() const wxOVERRIDE;
-    wxCoord GetCharWidth() const;
+    wxCoord GetCharWidth() const wxOVERRIDE;
-    bool CanGetTextExtent() const { return true; }
+    bool CanGetTextExtent() const wxOVERRIDE { return true; }
 
     // Resolution in pixels per logical inch
-    wxSize GetPPI() const;
+    wxSize GetPPI() const wxOVERRIDE;
 
-    virtual void ComputeScaleAndOrigin();
+    virtual void ComputeScaleAndOrigin() wxOVERRIDE;
 
-    void SetBackgroundMode(int WXUNUSED(mode)) { }
+    void SetBackgroundMode(int WXUNUSED(mode)) wxOVERRIDE { }
-    void SetPalette(const wxPalette& WXUNUSED(palette)) { }
+    void SetPalette(const wxPalette& WXUNUSED(palette)) wxOVERRIDE { }
 
     void SetPrintData(const wxPrintData& data);
     wxPrintData& GetPrintData() { return m_printData; }
 
-    virtual int GetDepth() const { return 24; }
+    virtual int GetDepth() const wxOVERRIDE { return 24; }
 
     void PsPrint( const wxString& psdata );
 
     // Overrridden for wxPrinterDC Impl
 
-    virtual int GetResolution() const;
+    virtual int GetResolution() const wxOVERRIDE;
-    virtual wxRect GetPaperRect() const;
+    virtual wxRect GetPaperRect() const wxOVERRIDE;
 
-    virtual void* GetHandle() const { return NULL; }
+    virtual void* GetHandle() const wxOVERRIDE { return NULL; }
     
 protected:
     bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col,
-                     wxFloodFillStyle style = wxFLOOD_SURFACE);
+                     wxFloodFillStyle style = wxFLOOD_SURFACE) wxOVERRIDE;
-    bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const;
+    bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const wxOVERRIDE;
-    void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+    void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) wxOVERRIDE;
-    void DoCrossHair(wxCoord x, wxCoord y) ;
+    void DoCrossHair(wxCoord x, wxCoord y) wxOVERRIDE ;
-    void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc);
+    void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc) wxOVERRIDE;
-    void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea);
+    void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) wxOVERRIDE;
-    void DoDrawPoint(wxCoord x, wxCoord y);
+    void DoDrawPoint(wxCoord x, wxCoord y) wxOVERRIDE;
-    void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0);
+    void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) wxOVERRIDE;
     void DoDrawPolygon(int n, const wxPoint points[],
                        wxCoord xoffset = 0, wxCoord yoffset = 0,
-                       wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+                       wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
     void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],
                            wxCoord xoffset = 0, wxCoord yoffset = 0,
-                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
+                           wxPolygonFillMode fillStyle = wxODDEVEN_RULE) wxOVERRIDE;
-    void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
-    void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20);
+    void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20) wxOVERRIDE;
-    void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
 #if wxUSE_SPLINES
-    void DoDrawSpline(const wxPointList *points);
+    void DoDrawSpline(const wxPointList *points) wxOVERRIDE;
 #endif
     bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                 wxDC *source, wxCoord xsrc, wxCoord ysrc,
                 wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-                wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+                wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) wxOVERRIDE;
-    void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) wxOVERRIDE;
-    void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false);
+    void DoDrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false) wxOVERRIDE;
-    void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    void DoDrawText(const wxString& text, wxCoord x, wxCoord y) wxOVERRIDE;
-    void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle);
+    void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) wxOVERRIDE;
-    void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) wxOVERRIDE;
-    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip))
+    void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip)) wxOVERRIDE
     {
         wxFAIL_MSG( "not implemented" );
     }
     void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                          wxCoord *descent = NULL,
                          wxCoord *externalLeading = NULL,
-                         const wxFont *theFont = NULL) const;
+                         const wxFont *theFont = NULL) const wxOVERRIDE;
-    void DoGetSize(int* width, int* height) const;
+    void DoGetSize(int* width, int* height) const wxOVERRIDE;
-    void DoGetSizeMM(int *width, int *height) const;
+    void DoGetSizeMM(int *width, int *height) const wxOVERRIDE;
 
     FILE*             m_pstream;    // PostScript output stream
     unsigned char     m_currentRed;

include/wx/generic/grid.h

@@ -355,7 +355,7 @@ class WXDLLIMPEXP_ADV wxGridRowHeaderRendererDefault
 public:
     virtual void DrawBorder(const wxGrid& grid,
                             wxDC& dc,
-                            wxRect& rect) const;
+                            wxRect& rect) const wxOVERRIDE;
 };
 
 // Column header cells renderers
@@ -365,7 +365,7 @@ class WXDLLIMPEXP_ADV wxGridColumnHeaderRendererDefault
 public:
     virtual void DrawBorder(const wxGrid& grid,
                             wxDC& dc,
-                            wxRect& rect) const;
+                            wxRect& rect) const wxOVERRIDE;
 };
 
 // Header corner renderer
@@ -375,7 +375,7 @@ class WXDLLIMPEXP_ADV wxGridCornerHeaderRendererDefault
 public:
     virtual void DrawBorder(const wxGrid& grid,
                             wxDC& dc,
-                            wxRect& rect) const;
+                            wxRect& rect) const wxOVERRIDE;
 };
 
 
@@ -826,25 +826,25 @@ public:
 
     // these are pure virtual in wxGridTableBase
     //
-    virtual int GetNumberRows() { return static_cast<int>(m_data.size()); }
+    virtual int GetNumberRows() wxOVERRIDE { return static_cast<int>(m_data.size()); }
-    virtual int GetNumberCols() { return m_numCols; }
+    virtual int GetNumberCols() wxOVERRIDE { return m_numCols; }
-    virtual wxString GetValue( int row, int col );
+    virtual wxString GetValue( int row, int col ) wxOVERRIDE;
-    virtual void SetValue( int row, int col, const wxString& s );
+    virtual void SetValue( int row, int col, const wxString& s ) wxOVERRIDE;
 
     // overridden functions from wxGridTableBase
     //
-    void Clear();
+    void Clear() wxOVERRIDE;
-    bool InsertRows( size_t pos = 0, size_t numRows = 1 );
+    bool InsertRows( size_t pos = 0, size_t numRows = 1 ) wxOVERRIDE;
-    bool AppendRows( size_t numRows = 1 );
+    bool AppendRows( size_t numRows = 1 ) wxOVERRIDE;
-    bool DeleteRows( size_t pos = 0, size_t numRows = 1 );
+    bool DeleteRows( size_t pos = 0, size_t numRows = 1 ) wxOVERRIDE;
-    bool InsertCols( size_t pos = 0, size_t numCols = 1 );
+    bool InsertCols( size_t pos = 0, size_t numCols = 1 ) wxOVERRIDE;
-    bool AppendCols( size_t numCols = 1 );
+    bool AppendCols( size_t numCols = 1 ) wxOVERRIDE;
-    bool DeleteCols( size_t pos = 0, size_t numCols = 1 );
+    bool DeleteCols( size_t pos = 0, size_t numCols = 1 ) wxOVERRIDE;
 
-    void SetRowLabelValue( int row, const wxString& );
+    void SetRowLabelValue( int row, const wxString& ) wxOVERRIDE;
-    void SetColLabelValue( int col, const wxString& );
+    void SetColLabelValue( int col, const wxString& ) wxOVERRIDE;
-    wxString GetRowLabelValue( int row );
+    wxString GetRowLabelValue( int row ) wxOVERRIDE;
-    wxString GetColLabelValue( int col );
+    wxString GetColLabelValue( int col ) wxOVERRIDE;
 
 private:
     wxGridStringArray m_data;
@@ -1083,7 +1083,7 @@ public:
 
     int      GetBatchCount() { return m_batchCount; }
 
-    virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL);
+    virtual void Refresh(bool eraseb = true, const wxRect* rect = NULL) wxOVERRIDE;
 
     // Use this, rather than wxWindow::Refresh(), to force an
     // immediate repainting of the grid. Has no effect if you are
@@ -1642,7 +1642,7 @@ public:
 
     // ------- drag and drop
 #if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget(wxDropTarget *dropTarget);
+    virtual void SetDropTarget(wxDropTarget *dropTarget) wxOVERRIDE;
 #endif // wxUSE_DRAG_AND_DROP
 
 
@@ -1838,16 +1838,16 @@ public:
 
 
     // override some base class functions
-    virtual bool Enable(bool enable = true);
+    virtual bool Enable(bool enable = true) wxOVERRIDE;
-    virtual wxWindow *GetMainWindowOfCompositeControl()
+    virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE
         { return (wxWindow*)m_gridWin; }
-    virtual void Fit();
+    virtual void Fit() wxOVERRIDE;
 
     // implementation only
     void CancelMouseCapture();
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
     bool m_created;
 
@@ -2166,7 +2166,7 @@ protected:
 private:
 
     // implement wxScrolledWindow method to return m_gridWin size
-    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);
+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE;
 
     // redraw the grid lines, should be called after changing their attributes
     void RedrawGridLines();
@@ -2420,7 +2420,7 @@ public:
     wxPoint     GetPosition() { return wxPoint( m_x, m_y ); }
     bool        Selecting() { return m_selecting; }
 
-    virtual wxEvent *Clone() const { return new wxGridEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEvent(*this); }
 
 protected:
     int         m_row;
@@ -2480,7 +2480,7 @@ public:
     int         GetRowOrCol() { return m_rowOrCol; }
     wxPoint     GetPosition() { return wxPoint( m_x, m_y ); }
 
-    virtual wxEvent *Clone() const { return new wxGridSizeEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridSizeEvent(*this); }
 
 protected:
     int         m_rowOrCol;
@@ -2544,7 +2544,7 @@ public:
     int         GetRightCol()  { return m_bottomRight.GetCol(); }
     bool        Selecting() { return m_selecting; }
 
-    virtual wxEvent *Clone() const { return new wxGridRangeSelectEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridRangeSelectEvent(*this); }
 
 protected:
     void Init(const wxGridCellCoords& topLeft,
@@ -2585,7 +2585,7 @@ public:
     void SetCol(int col)                { m_col = col; }
     void SetControl(wxControl* ctrl)    { m_ctrl = ctrl; }
 
-    virtual wxEvent *Clone() const { return new wxGridEditorCreatedEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxGridEditorCreatedEvent(*this); }
 
 private:
     int m_row;

include/wx/generic/gridctrl.h

@@ -29,15 +29,15 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     // return the string extent
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE
         { return new wxGridCellStringRenderer; }
 
 protected:
@@ -63,14 +63,14 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE
         { return new wxGridCellNumberRenderer; }
 
 protected:
@@ -98,18 +98,18 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
     // parameters string format is "width[,precision[,format]]"
     // with format being one of f|e|g|E|F|G
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const;
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE;
 
 protected:
     wxString GetString(const wxGrid& grid, int row, int col);
@@ -133,15 +133,15 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     // return the checkmark size
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE
         { return new wxGridCellBoolRenderer; }
 
 private:
@@ -166,17 +166,17 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const;
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE;
 
     // output strptime()-like format string
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
 
 protected:
     wxString GetString(const wxGrid& grid, int row, int col);
@@ -201,18 +201,18 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const;
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE;
 
     // parameters string format is "item1[,item2[...,itemN]]" where itemN will
     // be used if the cell value is N-1
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
 
 protected:
     wxString GetString(const wxGrid& grid, int row, int col);
@@ -231,14 +231,14 @@ public:
                       wxDC& dc,
                       const wxRect& rect,
                       int row, int col,
-                      bool isSelected);
+                      bool isSelected) wxOVERRIDE;
 
     virtual wxSize GetBestSize(wxGrid& grid,
                                wxGridCellAttr& attr,
                                wxDC& dc,
-                               int row, int col);
+                               int row, int col) wxOVERRIDE;
 
-    virtual wxGridCellRenderer *Clone() const
+    virtual wxGridCellRenderer *Clone() const wxOVERRIDE
         { return new wxGridCellAutoWrapStringRenderer; }
 
 private:

include/wx/generic/grideditors.h

@@ -57,31 +57,31 @@ public:
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
-                        wxEvtHandler* evtHandler);
+                        wxEvtHandler* evtHandler) wxOVERRIDE;
-    virtual void SetSize(const wxRect& rect);
+    virtual void SetSize(const wxRect& rect) wxOVERRIDE;
 
     virtual void PaintBackground(wxDC& dc,
                                  const wxRect& rectCell,
-                                 const wxGridCellAttr& attr);
+                                 const wxGridCellAttr& attr) wxOVERRIDE;
 
-    virtual bool IsAcceptedKey(wxKeyEvent& event);
+    virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE;
-    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
-                         const wxString& oldval, wxString *newval);
+                         const wxString& oldval, wxString *newval) wxOVERRIDE;
-    virtual void ApplyEdit(int row, int col, wxGrid* grid);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
 
-    virtual void Reset();
+    virtual void Reset() wxOVERRIDE;
-    virtual void StartingKey(wxKeyEvent& event);
+    virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE;
-    virtual void HandleReturn(wxKeyEvent& event);
+    virtual void HandleReturn(wxKeyEvent& event) wxOVERRIDE;
 
     // parameters string format is "max_width"
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
     virtual void SetValidator(const wxValidator& validator);
 
-    virtual wxGridCellEditor *Clone() const;
+    virtual wxGridCellEditor *Clone() const wxOVERRIDE;
 
     // added GetValue so we can get the value which is in the control
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const wxOVERRIDE;
 
 protected:
     wxTextCtrl *Text() const { return (wxTextCtrl *)m_control; }
@@ -110,25 +110,25 @@ public:
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
-                        wxEvtHandler* evtHandler);
+                        wxEvtHandler* evtHandler) wxOVERRIDE;
 
-    virtual bool IsAcceptedKey(wxKeyEvent& event);
+    virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE;
-    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
-                         const wxString& oldval, wxString *newval);
+                         const wxString& oldval, wxString *newval) wxOVERRIDE;
-    virtual void ApplyEdit(int row, int col, wxGrid* grid);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
 
-    virtual void Reset();
+    virtual void Reset() wxOVERRIDE;
-    virtual void StartingKey(wxKeyEvent& event);
+    virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE;
 
     // parameters string format is "min,max"
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
 
-    virtual wxGridCellEditor *Clone() const
+    virtual wxGridCellEditor *Clone() const wxOVERRIDE
         { return new wxGridCellNumberEditor(m_min, m_max); }
 
     // added GetValue so we can get the value which is in the control
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const wxOVERRIDE;
 
 protected:
 #if wxUSE_SPINCTRL
@@ -193,23 +193,23 @@ public:
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
-                        wxEvtHandler* evtHandler);
+                        wxEvtHandler* evtHandler) wxOVERRIDE;
 
-    virtual bool IsAcceptedKey(wxKeyEvent& event);
+    virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE;
-    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
-                         const wxString& oldval, wxString *newval);
+                         const wxString& oldval, wxString *newval) wxOVERRIDE;
-    virtual void ApplyEdit(int row, int col, wxGrid* grid);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
 
-    virtual void Reset();
+    virtual void Reset() wxOVERRIDE;
-    virtual void StartingKey(wxKeyEvent& event);
+    virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE;
 
-    virtual wxGridCellEditor *Clone() const
+    virtual wxGridCellEditor *Clone() const wxOVERRIDE
         { return new wxGridCellFloatEditor(m_width, m_precision); }
 
     // parameters string format is "width[,precision[,format]]"
     // format to choose beween f|e|g|E|G (f is used by default)
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
 
 protected:
     // string representation of our value
@@ -238,27 +238,27 @@ public:
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
-                        wxEvtHandler* evtHandler);
+                        wxEvtHandler* evtHandler) wxOVERRIDE;
 
-    virtual void SetSize(const wxRect& rect);
+    virtual void SetSize(const wxRect& rect) wxOVERRIDE;
-    virtual void Show(bool show, wxGridCellAttr *attr = NULL);
+    virtual void Show(bool show, wxGridCellAttr *attr = NULL) wxOVERRIDE;
 
-    virtual bool IsAcceptedKey(wxKeyEvent& event);
+    virtual bool IsAcceptedKey(wxKeyEvent& event) wxOVERRIDE;
-    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
-                         const wxString& oldval, wxString *newval);
+                         const wxString& oldval, wxString *newval) wxOVERRIDE;
-    virtual void ApplyEdit(int row, int col, wxGrid* grid);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
 
-    virtual void Reset();
+    virtual void Reset() wxOVERRIDE;
-    virtual void StartingClick();
+    virtual void StartingClick() wxOVERRIDE;
-    virtual void StartingKey(wxKeyEvent& event);
+    virtual void StartingKey(wxKeyEvent& event) wxOVERRIDE;
 
-    virtual wxGridCellEditor *Clone() const
+    virtual wxGridCellEditor *Clone() const wxOVERRIDE
         { return new wxGridCellBoolEditor; }
 
     // added GetValue so we can get the value which is in the control, see
     // also UseStringValues()
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const wxOVERRIDE;
 
     // set the string values returned by GetValue() for the true and false
     // states, respectively
@@ -297,28 +297,28 @@ public:
 
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
-                        wxEvtHandler* evtHandler);
+                        wxEvtHandler* evtHandler) wxOVERRIDE;
 
-    virtual void SetSize(const wxRect& rect);
+    virtual void SetSize(const wxRect& rect) wxOVERRIDE;
 
     virtual void PaintBackground(wxDC& dc,
                                  const wxRect& rectCell,
-                                 const wxGridCellAttr& attr);
+                                 const wxGridCellAttr& attr) wxOVERRIDE;
 
-    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
-                         const wxString& oldval, wxString *newval);
+                         const wxString& oldval, wxString *newval) wxOVERRIDE;
-    virtual void ApplyEdit(int row, int col, wxGrid* grid);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
 
-    virtual void Reset();
+    virtual void Reset() wxOVERRIDE;
 
     // parameters string format is "item1[,item2[...,itemN]]"
-    virtual void SetParameters(const wxString& params);
+    virtual void SetParameters(const wxString& params) wxOVERRIDE;
 
-    virtual wxGridCellEditor *Clone() const;
+    virtual wxGridCellEditor *Clone() const wxOVERRIDE;
 
     // added GetValue so we can get the value which is in the control
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const wxOVERRIDE;
 
 protected:
     wxComboBox *Combo() const { return (wxComboBox *)m_control; }
@@ -340,12 +340,12 @@ public:
     wxGridCellEnumEditor( const wxString& choices = wxEmptyString );
     virtual ~wxGridCellEnumEditor() {}
 
-    virtual wxGridCellEditor*  Clone() const;
+    virtual wxGridCellEditor*  Clone() const wxOVERRIDE;
 
-    virtual void BeginEdit(int row, int col, wxGrid* grid);
+    virtual void BeginEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
     virtual bool EndEdit(int row, int col, const wxGrid* grid,
-                         const wxString& oldval, wxString *newval);
+                         const wxString& oldval, wxString *newval) wxOVERRIDE;
-    virtual void ApplyEdit(int row, int col, wxGrid* grid);
+    virtual void ApplyEdit(int row, int col, wxGrid* grid) wxOVERRIDE;
 
 private:
     long m_index;
@@ -361,9 +361,9 @@ public:
     wxGridCellAutoWrapStringEditor() : wxGridCellTextEditor() { }
     virtual void Create(wxWindow* parent,
                         wxWindowID id,
-                        wxEvtHandler* evtHandler);
+                        wxEvtHandler* evtHandler) wxOVERRIDE;
 
-    virtual wxGridCellEditor *Clone() const
+    virtual wxGridCellEditor *Clone() const wxOVERRIDE
         { return new wxGridCellAutoWrapStringEditor; }
 
     wxDECLARE_NO_COPY_CLASS(wxGridCellAutoWrapStringEditor);

include/wx/generic/headerctrlg.h

@@ -48,19 +48,19 @@ public:
     virtual ~wxHeaderCtrl();
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
     
 private:
     // implement base class pure virtuals
-    virtual void DoSetCount(unsigned int count);
+    virtual void DoSetCount(unsigned int count) wxOVERRIDE;
-    virtual unsigned int DoGetCount() const;
+    virtual unsigned int DoGetCount() const wxOVERRIDE;
-    virtual void DoUpdate(unsigned int idx);
+    virtual void DoUpdate(unsigned int idx) wxOVERRIDE;
 
-    virtual void DoScrollHorz(int dx);
+    virtual void DoScrollHorz(int dx) wxOVERRIDE;
 
-    virtual void DoSetColumnsOrder(const wxArrayInt& order);
+    virtual void DoSetColumnsOrder(const wxArrayInt& order) wxOVERRIDE;
-    virtual wxArrayInt DoGetColumnsOrder() const;
+    virtual wxArrayInt DoGetColumnsOrder() const wxOVERRIDE;
 
     // common part of all ctors
     void Init();

include/wx/generic/icon.h

@@ -47,7 +47,7 @@ public:
 
     // unhide the base class version
     virtual bool LoadFile(const wxString& name,
-                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
+                          wxBitmapType flags = wxICON_DEFAULT_TYPE) wxOVERRIDE
         { return wxBitmap::LoadFile(name, flags); }
 
     // create from bitmap (which should have a mask unless it's monochrome):

include/wx/generic/infobar.h

@@ -38,13 +38,13 @@ public:
     // ----------------------------
 
     virtual void ShowMessage(const wxString& msg,
-                             int flags = wxICON_INFORMATION);
+                             int flags = wxICON_INFORMATION) wxOVERRIDE;
 
-    virtual void Dismiss();
+    virtual void Dismiss() wxOVERRIDE;
 
-    virtual void AddButton(wxWindowID btnid, const wxString& label = wxString());
+    virtual void AddButton(wxWindowID btnid, const wxString& label = wxString()) wxOVERRIDE;
 
-    virtual void RemoveButton(wxWindowID btnid);
+    virtual void RemoveButton(wxWindowID btnid) wxOVERRIDE;
 
     // methods specific to this version
     // --------------------------------
@@ -77,15 +77,15 @@ public:
 
     // setting the font of this window sets it for the text control inside it
     // (default font is a larger and bold version of the normal one)
-    virtual bool SetFont(const wxFont& font);
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
 
     // same thing with the colour: this affects the text colour
-    virtual bool SetForegroundColour(const wxColor& colour);
+    virtual bool SetForegroundColour(const wxColor& colour) wxOVERRIDE;
 
 protected:
     // info bar shouldn't have any border by default, the colour difference
     // between it and the main window separates it well enough
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
 
 
     // update the parent to take our new or changed size into account (notably

include/wx/generic/laywin.h

@@ -87,7 +87,7 @@ public:
     void SetAlignment(wxLayoutAlignment align) { m_alignment = align; }
     wxLayoutAlignment GetAlignment() const { return m_alignment; }
 
-    virtual wxEvent *Clone() const { return new wxQueryLayoutInfoEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxQueryLayoutInfoEvent(*this); }
 
 protected:
     int                     m_flags;
@@ -130,7 +130,7 @@ public:
     void SetRect(const wxRect& rect) { m_rect = rect; }
     wxRect GetRect() const { return m_rect; }
 
-    virtual wxEvent *Clone() const { return new wxCalculateLayoutEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCalculateLayoutEvent(*this); }
 
 protected:
     int                     m_flags;

include/wx/generic/listctrl.h

@@ -63,10 +63,10 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString &name = wxListCtrlNameStr);
 
-    bool GetColumn( int col, wxListItem& item ) const;
+    bool GetColumn( int col, wxListItem& item ) const wxOVERRIDE;
-    bool SetColumn( int col, const wxListItem& item );
+    bool SetColumn( int col, const wxListItem& item ) wxOVERRIDE;
-    int GetColumnWidth( int col ) const;
+    int GetColumnWidth( int col ) const wxOVERRIDE;
-    bool SetColumnWidth( int col, int width);
+    bool SetColumnWidth( int col, int width) wxOVERRIDE;
     int GetCountPerPage() const; // not the same in wxGLC as in Windows, I think
     wxRect GetViewRect() const;
 
@@ -87,7 +87,7 @@ public:
     bool GetItemPosition( long item, wxPoint& pos ) const;
     bool SetItemPosition( long item, const wxPoint& pos ); // not supported in wxGLC
     int GetItemCount() const;
-    int GetColumnCount() const;
+    int GetColumnCount() const wxOVERRIDE;
     void SetItemSpacing( int spacing, bool isSmall = false );
     wxSize GetItemSpacing() const;
     void SetItemTextColour( long item, const wxColour& col);
@@ -102,19 +102,19 @@ public:
     long GetTopItem() const;
 
     void SetSingleStyle( long style, bool add = true ) ;
-    void SetWindowStyleFlag( long style );
+    void SetWindowStyleFlag( long style ) wxOVERRIDE;
     void RecreateWindow() {}
     long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;
-    wxImageList *GetImageList( int which ) const;
+    wxImageList *GetImageList( int which ) const wxOVERRIDE;
-    void SetImageList( wxImageList *imageList, int which );
+    void SetImageList( wxImageList *imageList, int which ) wxOVERRIDE;
-    void AssignImageList( wxImageList *imageList, int which );
+    void AssignImageList( wxImageList *imageList, int which ) wxOVERRIDE;
     bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
 
     void ClearAll();
     bool DeleteItem( long item );
     bool DeleteAllItems();
-    bool DeleteAllColumns();
+    bool DeleteAllColumns() wxOVERRIDE;
-    bool DeleteColumn( int col );
+    bool DeleteColumn( int col ) wxOVERRIDE;
 
     void SetItemCount(long count);
 
@@ -143,12 +143,12 @@ public:
     void RefreshItem(long item);
     void RefreshItems(long itemFrom, long itemTo);
 
-    virtual void EnableBellOnNoMatch(bool on = true);
+    virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE;
 
     // overridden base class virtuals
     // ------------------------------
 
-    virtual wxVisualAttributes GetDefaultAttributes() const
+    virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
     {
         return GetClassDefaultAttributes(GetWindowVariant());
     }
@@ -156,7 +156,7 @@ public:
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
-    virtual void Update();
+    virtual void Update() wxOVERRIDE;
 
 
     // implementation only from now on
@@ -165,25 +165,25 @@ public:
     // generic version extension, don't use in portable code
     bool Update( long item );
 
-    void OnInternalIdle( );
+    void OnInternalIdle( ) wxOVERRIDE;
 
     // We have to hand down a few functions
     virtual void Refresh(bool eraseBackground = true,
-                         const wxRect *rect = NULL);
+                         const wxRect *rect = NULL) wxOVERRIDE;
 
-    virtual bool SetBackgroundColour( const wxColour &colour );
+    virtual bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
-    virtual bool SetForegroundColour( const wxColour &colour );
+    virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE;
     virtual wxColour GetBackgroundColour() const;
     virtual wxColour GetForegroundColour() const;
-    virtual bool SetFont( const wxFont &font );
+    virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
-    virtual bool SetCursor( const wxCursor &cursor );
+    virtual bool SetCursor( const wxCursor &cursor ) wxOVERRIDE;
 
 #if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
+    virtual void SetDropTarget( wxDropTarget *dropTarget ) wxOVERRIDE;
-    virtual wxDropTarget *GetDropTarget() const;
+    virtual wxDropTarget *GetDropTarget() const wxOVERRIDE;
 #endif
 
-    virtual bool ShouldInheritColours() const { return false; }
+    virtual bool ShouldInheritColours() const wxOVERRIDE { return false; }
 
     // implementation
     // --------------
@@ -199,12 +199,12 @@ public:
 
 protected:
     // Implement base class pure virtual methods.
-    long DoInsertColumn(long col, const wxListItem& info);
+    long DoInsertColumn(long col, const wxListItem& info) wxOVERRIDE;
 
 
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
+    virtual bool DoPopupMenu( wxMenu *menu, int x, int y ) wxOVERRIDE;
 
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
 
     // return the text for the given column of the given item
     virtual wxString OnGetItemText(long item, long column) const;
@@ -220,9 +220,9 @@ protected:
     // it calls our OnGetXXX() functions
     friend class WXDLLIMPEXP_FWD_CORE wxListMainWindow;
 
-    virtual wxBorder GetDefaultBorder() const;
+    virtual wxBorder GetDefaultBorder() const wxOVERRIDE;
 
-    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size);
+    virtual wxSize GetSizeAvailableForScrollTarget(const wxSize& size) wxOVERRIDE;
 
 private:
     void CreateOrDestroyHeaderWindowAsNeeded();

include/wx/generic/logg.h

@@ -33,7 +33,7 @@ public:
 
 protected:
     // implement sink function
-    virtual void DoLogText(const wxString& msg);
+    virtual void DoLogText(const wxString& msg) wxOVERRIDE;
 
 private:
     // the control we use
@@ -57,12 +57,12 @@ public:
     wxLogGui();
 
     // show all messages that were logged since the last Flush()
-    virtual void Flush();
+    virtual void Flush() wxOVERRIDE;
 
 protected:
     virtual void DoLogRecord(wxLogLevel level,
                              const wxString& msg,
-                             const wxLogRecordInfo& info);
+                             const wxLogRecordInfo& info) wxOVERRIDE;
 
     // return the title to be used for the log dialog, depending on m_bErrors
     // and m_bWarnings values
@@ -136,7 +136,7 @@ public:
     virtual void OnFrameDelete(wxFrame *frame);
 
 protected:
-    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg);
+    virtual void DoLogTextAtLevel(wxLogLevel level, const wxString& msg) wxOVERRIDE;
 
 private:
     wxLogFrame *m_pLogFrame;      // the log frame

include/wx/generic/printps.h

@@ -26,9 +26,9 @@ public:
     wxPostScriptPrinter(wxPrintDialogData *data = NULL);
     virtual ~wxPostScriptPrinter();
 
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
+    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true) wxOVERRIDE;
-    virtual wxDC* PrintDialog(wxWindow *parent);
+    virtual wxDC* PrintDialog(wxWindow *parent) wxOVERRIDE;
-    virtual bool Setup(wxWindow *parent);
+    virtual bool Setup(wxWindow *parent) wxOVERRIDE;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
@@ -51,8 +51,8 @@ public:
 
     virtual ~wxPostScriptPrintPreview();
 
-    virtual bool Print(bool interactive);
+    virtual bool Print(bool interactive) wxOVERRIDE;
-    virtual void DetermineScaling();
+    virtual void DetermineScaling() wxOVERRIDE;
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);

include/wx/generic/progdlgg.h

@@ -57,9 +57,9 @@ public:
     bool WasSkipped() const;
 
     // Must provide overload to avoid hiding it (and warnings about it)
-    virtual void Update() { wxDialog::Update(); }
+    virtual void Update() wxOVERRIDE { wxDialog::Update(); }
 
-    virtual bool Show( bool show = true );
+    virtual bool Show( bool show = true ) wxOVERRIDE;
 
     // This enum is an implementation detail and should not be used
     // by user code.

include/wx/generic/propdlg.h

@@ -106,7 +106,7 @@ public:
     wxBookCtrlBase* GetBookCtrl() const { return m_bookCtrl; }
 
     // Override function in base
-    virtual wxWindow* GetContentWindow() const;
+    virtual wxWindow* GetContentWindow() const wxOVERRIDE;
 
     // Set and get the inner sizer
     void SetInnerSize(wxSizer* sizer) { m_innerSizer = sizer; }

include/wx/generic/sashwin.h

@@ -224,7 +224,7 @@ public:
     void SetDragStatus(wxSashDragStatus status) { m_dragStatus = status; }
     wxSashDragStatus GetDragStatus() const { return m_dragStatus; }
 
-    virtual wxEvent *Clone() const { return new wxSashEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxSashEvent(*this); }
 
 private:
     wxSashEdgePosition  m_edge;

include/wx/generic/splash.h

@@ -54,7 +54,7 @@ public:
     int GetTimeout() const { return m_milliseconds; }
 
     // Override wxEventFilter method to hide splash screen on any user input.
-    virtual int FilterEvent(wxEvent& event);
+    virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
 
 protected:
     // Common part of all ctors.

include/wx/generic/splitter.h

@@ -202,7 +202,7 @@ public:
     void OnSize(wxSizeEvent& event);
 
     // In live mode, resize child windows in idle time
-    void OnInternalIdle();
+    void OnInternalIdle() wxOVERRIDE;
 
     // Draws the sash
     virtual void DrawSash(wxDC& dc);
@@ -274,7 +274,7 @@ protected:
 
     // return the best size of the splitter equal to best sizes of its
     // subwindows
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 
     wxSplitMode m_splitMode;
@@ -370,7 +370,7 @@ public:
         return m_data.pt.y;
     }
 
-    virtual wxEvent *Clone() const { return new wxSplitterEvent(*this); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxSplitterEvent(*this); }
 
 private:
     friend class WXDLLIMPEXP_FWD_CORE wxSplitterWindow;

include/wx/generic/srchctlg.h

@@ -49,17 +49,17 @@ public:
 #if wxUSE_MENUS
     // get/set search button menu
     // --------------------------
-    virtual void SetMenu( wxMenu* menu );
+    virtual void SetMenu( wxMenu* menu ) wxOVERRIDE;
-    virtual wxMenu* GetMenu();
+    virtual wxMenu* GetMenu() wxOVERRIDE;
 #endif // wxUSE_MENUS
 
     // get/set search options
     // ----------------------
-    virtual void ShowSearchButton( bool show );
+    virtual void ShowSearchButton( bool show ) wxOVERRIDE;
-    virtual bool IsSearchButtonVisible() const;
+    virtual bool IsSearchButtonVisible() const wxOVERRIDE;
 
-    virtual void ShowCancelButton( bool show );
+    virtual void ShowCancelButton( bool show ) wxOVERRIDE;
-    virtual bool IsCancelButtonVisible() const;
+    virtual bool IsCancelButtonVisible() const wxOVERRIDE;
 
     // TODO: In 2.9 these should probably be virtual, and declared in the base class...
     void SetDescriptiveText(const wxString& text);
@@ -68,48 +68,48 @@ public:
     // accessors
     // ---------
 
-    virtual wxString GetRange(long from, long to) const;
+    virtual wxString GetRange(long from, long to) const wxOVERRIDE;
 
-    virtual int GetLineLength(long lineNo) const;
+    virtual int GetLineLength(long lineNo) const wxOVERRIDE;
-    virtual wxString GetLineText(long lineNo) const;
+    virtual wxString GetLineText(long lineNo) const wxOVERRIDE;
-    virtual int GetNumberOfLines() const;
+    virtual int GetNumberOfLines() const wxOVERRIDE;
 
-    virtual bool IsModified() const;
+    virtual bool IsModified() const wxOVERRIDE;
-    virtual bool IsEditable() const;
+    virtual bool IsEditable() const wxOVERRIDE;
 
     // more readable flag testing methods
     virtual bool IsSingleLine() const;
     virtual bool IsMultiLine() const;
 
     // If the return values from and to are the same, there is no selection.
-    virtual void GetSelection(long* from, long* to) const;
+    virtual void GetSelection(long* from, long* to) const wxOVERRIDE;
 
-    virtual wxString GetStringSelection() const;
+    virtual wxString GetStringSelection() const wxOVERRIDE;
 
     // operations
     // ----------
 
     // editing
-    virtual void Clear();
+    virtual void Clear() wxOVERRIDE;
-    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Replace(long from, long to, const wxString& value) wxOVERRIDE;
-    virtual void Remove(long from, long to);
+    virtual void Remove(long from, long to) wxOVERRIDE;
 
     // load/save the controls contents from/to the file
     virtual bool LoadFile(const wxString& file);
     virtual bool SaveFile(const wxString& file = wxEmptyString);
 
     // sets/clears the dirty flag
-    virtual void MarkDirty();
+    virtual void MarkDirty() wxOVERRIDE;
-    virtual void DiscardEdits();
+    virtual void DiscardEdits() wxOVERRIDE;
 
     // set the max number of characters which may be entered in a single line
     // text control
-    virtual void SetMaxLength(unsigned long WXUNUSED(len));
+    virtual void SetMaxLength(unsigned long WXUNUSED(len)) wxOVERRIDE;
 
     // writing text inserts it at the current position, appending always
     // inserts it at the end
-    virtual void WriteText(const wxString& text);
+    virtual void WriteText(const wxString& text) wxOVERRIDE;
-    virtual void AppendText(const wxString& text);
+    virtual void AppendText(const wxString& text) wxOVERRIDE;
 
     // insert the character which would have resulted from this key event,
     // return true if anything has been inserted
@@ -118,53 +118,53 @@ public:
     // text control under some platforms supports the text styles: these
     // methods allow to apply the given text style to the given selection or to
     // set/get the style which will be used for all appended text
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
+    virtual bool SetStyle(long start, long end, const wxTextAttr& style) wxOVERRIDE;
-    virtual bool GetStyle(long position, wxTextAttr& style);
+    virtual bool GetStyle(long position, wxTextAttr& style) wxOVERRIDE;
-    virtual bool SetDefaultStyle(const wxTextAttr& style);
+    virtual bool SetDefaultStyle(const wxTextAttr& style) wxOVERRIDE;
-    virtual const wxTextAttr& GetDefaultStyle() const;
+    virtual const wxTextAttr& GetDefaultStyle() const wxOVERRIDE;
 
     // translate between the position (which is just an index in the text ctrl
     // considering all its contents as a single strings) and (x, y) coordinates
     // which represent column and line.
-    virtual long XYToPosition(long x, long y) const;
+    virtual long XYToPosition(long x, long y) const wxOVERRIDE;
-    virtual bool PositionToXY(long pos, long *x, long *y) const;
+    virtual bool PositionToXY(long pos, long *x, long *y) const wxOVERRIDE;
 
-    virtual void ShowPosition(long pos);
+    virtual void ShowPosition(long pos) wxOVERRIDE;
 
     // find the character at position given in pixels
     //
     // NB: pt is in device coords (not adjusted for the client area origin nor
     //     scrolling)
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
+    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const wxOVERRIDE;
     virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
                                             wxTextCoord *col,
-                                            wxTextCoord *row) const;
+                                            wxTextCoord *row) const wxOVERRIDE;
 
     // Clipboard operations
-    virtual void Copy();
+    virtual void Copy() wxOVERRIDE;
-    virtual void Cut();
+    virtual void Cut() wxOVERRIDE;
-    virtual void Paste();
+    virtual void Paste() wxOVERRIDE;
 
-    virtual bool CanCopy() const;
+    virtual bool CanCopy() const wxOVERRIDE;
-    virtual bool CanCut() const;
+    virtual bool CanCut() const wxOVERRIDE;
-    virtual bool CanPaste() const;
+    virtual bool CanPaste() const wxOVERRIDE;
 
     // Undo/redo
-    virtual void Undo();
+    virtual void Undo() wxOVERRIDE;
-    virtual void Redo();
+    virtual void Redo() wxOVERRIDE;
 
-    virtual bool CanUndo() const;
+    virtual bool CanUndo() const wxOVERRIDE;
-    virtual bool CanRedo() const;
+    virtual bool CanRedo() const wxOVERRIDE;
 
     // Insertion point
-    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
-    virtual void SetInsertionPointEnd();
+    virtual void SetInsertionPointEnd() wxOVERRIDE;
-    virtual long GetInsertionPoint() const;
+    virtual long GetInsertionPoint() const wxOVERRIDE;
-    virtual wxTextPos GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const wxOVERRIDE;
 
-    virtual void SetSelection(long from, long to);
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
-    virtual void SelectAll();
+    virtual void SelectAll() wxOVERRIDE;
-    virtual void SetEditable(bool editable);
+    virtual void SetEditable(bool editable) wxOVERRIDE;
 
 #if 0
 
@@ -184,13 +184,13 @@ public:
 #endif
 
     // do the window-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event);
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE;
 
-    virtual bool ShouldInheritColours() const;
+    virtual bool ShouldInheritColours() const wxOVERRIDE;
 
     // wxWindow overrides
-    virtual bool SetFont(const wxFont& font);
+    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
-    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
 
     // search control generic only
     void SetSearchBitmap( const wxBitmap& bitmap );
@@ -200,15 +200,15 @@ public:
 #endif // wxUSE_MENUS
 
 protected:
-    virtual void DoSetValue(const wxString& value, int flags);
+    virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE;
-    virtual wxString DoGetValue() const;
+    virtual wxString DoGetValue() const wxOVERRIDE;
 
-    virtual bool DoLoadFile(const wxString& file, int fileType);
+    virtual bool DoLoadFile(const wxString& file, int fileType) wxOVERRIDE;
-    virtual bool DoSaveFile(const wxString& file, int fileType);
+    virtual bool DoSaveFile(const wxString& file, int fileType) wxOVERRIDE;
 
     // override the base class virtuals involved into geometry calculations
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
+    virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
     virtual void LayoutControls(int x, int y, int width, int height);
 
     virtual void RecalcBitmaps();
@@ -236,7 +236,7 @@ private:
     friend class wxSearchButton;
 
     // Implement pure virtual function inherited from wxCompositeWindow.
-    virtual wxWindowList GetCompositeWindowParts() const;
+    virtual wxWindowList GetCompositeWindowParts() const wxOVERRIDE;
 
 #if wxUSE_MENUS
     void PopupSearchMenu();

include/wx/generic/statusbr.h

@@ -44,12 +44,12 @@ public:
                 const wxString& name = wxStatusBarNameStr);
 
     // implement base class methods
-    virtual void SetStatusWidths(int n, const int widths_field[]);
+    virtual void SetStatusWidths(int n, const int widths_field[]) wxOVERRIDE;
-    virtual bool GetFieldRect(int i, wxRect& rect) const;
+    virtual bool GetFieldRect(int i, wxRect& rect) const wxOVERRIDE;
-    virtual void SetMinHeight(int height);
+    virtual void SetMinHeight(int height) wxOVERRIDE;
 
-    virtual int GetBorderX() const { return m_borderX; }
+    virtual int GetBorderX() const wxOVERRIDE { return m_borderX; }
-    virtual int GetBorderY() const { return m_borderY; }
+    virtual int GetBorderY() const wxOVERRIDE { return m_borderY; }
 
 
     // implementation only (not part of wxStatusBar public API):
@@ -57,7 +57,7 @@ public:
     int GetFieldFromPoint(const wxPoint& point) const;
 
 protected:
-    virtual void DoUpdateStatusText(int number);
+    virtual void DoUpdateStatusText(int number) wxOVERRIDE;
 
     // event handlers
     void OnPaint(wxPaintEvent& event);
@@ -103,7 +103,7 @@ protected:
     wxPen             m_mediumShadowPen;
     wxPen             m_hilightPen;
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 private:
     // Update m_lastClientSize and m_widthsAbs from the current size.

include/wx/generic/textdlgg.h

@@ -72,8 +72,8 @@ public:
     wxTextValidator* GetTextValidator() { return (wxTextValidator*)m_textctrl->GetValidator(); }
 #endif // wxUSE_VALIDATORS
 
-    virtual bool TransferDataToWindow();
+    virtual bool TransferDataToWindow() wxOVERRIDE;
-    virtual bool TransferDataFromWindow();
+    virtual bool TransferDataFromWindow() wxOVERRIDE;
 
     // implementation only
     void OnOK(wxCommandEvent& event);

include/wx/generic/treectlg.h

@@ -67,74 +67,74 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
-    virtual unsigned int GetCount() const;
+    virtual unsigned int GetCount() const wxOVERRIDE;
 
-    virtual unsigned int GetIndent() const { return m_indent; }
+    virtual unsigned int GetIndent() const wxOVERRIDE { return m_indent; }
-    virtual void SetIndent(unsigned int indent);
+    virtual void SetIndent(unsigned int indent) wxOVERRIDE;
 
 
-    virtual void SetImageList(wxImageList *imageList);
+    virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
-    virtual void SetStateImageList(wxImageList *imageList);
+    virtual void SetStateImageList(wxImageList *imageList) wxOVERRIDE;
 
-    virtual wxString GetItemText(const wxTreeItemId& item) const;
+    virtual wxString GetItemText(const wxTreeItemId& item) const wxOVERRIDE;
     virtual int GetItemImage(const wxTreeItemId& item,
-                     wxTreeItemIcon which = wxTreeItemIcon_Normal) const;
+                     wxTreeItemIcon which = wxTreeItemIcon_Normal) const wxOVERRIDE;
-    virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const;
+    virtual wxTreeItemData *GetItemData(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual wxColour GetItemTextColour(const wxTreeItemId& item) const;
+    virtual wxColour GetItemTextColour(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const;
+    virtual wxColour GetItemBackgroundColour(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual wxFont GetItemFont(const wxTreeItemId& item) const;
+    virtual wxFont GetItemFont(const wxTreeItemId& item) const wxOVERRIDE;
 
-    virtual void SetItemText(const wxTreeItemId& item, const wxString& text);
+    virtual void SetItemText(const wxTreeItemId& item, const wxString& text) wxOVERRIDE;
     virtual void SetItemImage(const wxTreeItemId& item,
                               int image,
-                              wxTreeItemIcon which = wxTreeItemIcon_Normal);
+                              wxTreeItemIcon which = wxTreeItemIcon_Normal) wxOVERRIDE;
-    virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data);
+    virtual void SetItemData(const wxTreeItemId& item, wxTreeItemData *data) wxOVERRIDE;
 
-    virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true);
+    virtual void SetItemHasChildren(const wxTreeItemId& item, bool has = true) wxOVERRIDE;
-    virtual void SetItemBold(const wxTreeItemId& item, bool bold = true);
+    virtual void SetItemBold(const wxTreeItemId& item, bool bold = true) wxOVERRIDE;
-    virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true);
+    virtual void SetItemDropHighlight(const wxTreeItemId& item, bool highlight = true) wxOVERRIDE;
-    virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
+    virtual void SetItemTextColour(const wxTreeItemId& item, const wxColour& col) wxOVERRIDE;
-    virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col);
+    virtual void SetItemBackgroundColour(const wxTreeItemId& item, const wxColour& col) wxOVERRIDE;
-    virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font);
+    virtual void SetItemFont(const wxTreeItemId& item, const wxFont& font) wxOVERRIDE;
 
-    virtual bool IsVisible(const wxTreeItemId& item) const;
+    virtual bool IsVisible(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual bool ItemHasChildren(const wxTreeItemId& item) const;
+    virtual bool ItemHasChildren(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual bool IsExpanded(const wxTreeItemId& item) const;
+    virtual bool IsExpanded(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual bool IsSelected(const wxTreeItemId& item) const;
+    virtual bool IsSelected(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual bool IsBold(const wxTreeItemId& item) const;
+    virtual bool IsBold(const wxTreeItemId& item) const wxOVERRIDE;
 
     virtual size_t GetChildrenCount(const wxTreeItemId& item,
-                                    bool recursively = true) const;
+                                    bool recursively = true) const wxOVERRIDE;
 
     // navigation
     // ----------
 
-    virtual wxTreeItemId GetRootItem() const { return m_anchor; }
+    virtual wxTreeItemId GetRootItem() const wxOVERRIDE { return m_anchor; }
-    virtual wxTreeItemId GetSelection() const
+    virtual wxTreeItemId GetSelection() const wxOVERRIDE
     {
         wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE),
                        wxT("must use GetSelections() with this control") );
 
         return m_current;
     }
-    virtual size_t GetSelections(wxArrayTreeItemIds&) const;
+    virtual size_t GetSelections(wxArrayTreeItemIds&) const wxOVERRIDE;
-    virtual wxTreeItemId GetFocusedItem() const { return m_current; }
+    virtual wxTreeItemId GetFocusedItem() const wxOVERRIDE { return m_current; }
 
-    virtual void ClearFocusedItem();
+    virtual void ClearFocusedItem() wxOVERRIDE;
-    virtual void SetFocusedItem(const wxTreeItemId& item);
+    virtual void SetFocusedItem(const wxTreeItemId& item) wxOVERRIDE;
 
-    virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetItemParent(const wxTreeItemId& item) const wxOVERRIDE;
     virtual wxTreeItemId GetFirstChild(const wxTreeItemId& item,
-                                       wxTreeItemIdValue& cookie) const;
+                                       wxTreeItemIdValue& cookie) const wxOVERRIDE;
     virtual wxTreeItemId GetNextChild(const wxTreeItemId& item,
-                                      wxTreeItemIdValue& cookie) const;
+                                      wxTreeItemIdValue& cookie) const wxOVERRIDE;
-    virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetLastChild(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetNextSibling(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const wxOVERRIDE;
 
-    virtual wxTreeItemId GetFirstVisibleItem() const;
+    virtual wxTreeItemId GetFirstVisibleItem() const wxOVERRIDE;
-    virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetNextVisible(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const;
+    virtual wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const wxOVERRIDE;
 
 
     // operations
@@ -142,41 +142,41 @@ public:
 
     virtual wxTreeItemId AddRoot(const wxString& text,
                          int image = -1, int selectedImage = -1,
-                         wxTreeItemData *data = NULL);
+                         wxTreeItemData *data = NULL) wxOVERRIDE;
 
-    virtual void Delete(const wxTreeItemId& item);
+    virtual void Delete(const wxTreeItemId& item) wxOVERRIDE;
-    virtual void DeleteChildren(const wxTreeItemId& item);
+    virtual void DeleteChildren(const wxTreeItemId& item) wxOVERRIDE;
-    virtual void DeleteAllItems();
+    virtual void DeleteAllItems() wxOVERRIDE;
 
-    virtual void Expand(const wxTreeItemId& item);
+    virtual void Expand(const wxTreeItemId& item) wxOVERRIDE;
-    virtual void Collapse(const wxTreeItemId& item);
+    virtual void Collapse(const wxTreeItemId& item) wxOVERRIDE;
-    virtual void CollapseAndReset(const wxTreeItemId& item);
+    virtual void CollapseAndReset(const wxTreeItemId& item) wxOVERRIDE;
-    virtual void Toggle(const wxTreeItemId& item);
+    virtual void Toggle(const wxTreeItemId& item) wxOVERRIDE;
 
-    virtual void Unselect();
+    virtual void Unselect() wxOVERRIDE;
-    virtual void UnselectAll();
+    virtual void UnselectAll() wxOVERRIDE;
-    virtual void SelectItem(const wxTreeItemId& item, bool select = true);
+    virtual void SelectItem(const wxTreeItemId& item, bool select = true) wxOVERRIDE;
-    virtual void SelectChildren(const wxTreeItemId& parent);
+    virtual void SelectChildren(const wxTreeItemId& parent) wxOVERRIDE;
 
-    virtual void EnsureVisible(const wxTreeItemId& item);
+    virtual void EnsureVisible(const wxTreeItemId& item) wxOVERRIDE;
-    virtual void ScrollTo(const wxTreeItemId& item);
+    virtual void ScrollTo(const wxTreeItemId& item) wxOVERRIDE;
 
     virtual wxTextCtrl *EditLabel(const wxTreeItemId& item,
-                          wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl));
+                          wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)) wxOVERRIDE;
-    virtual wxTextCtrl *GetEditControl() const;
+    virtual wxTextCtrl *GetEditControl() const wxOVERRIDE;
     virtual void EndEditLabel(const wxTreeItemId& item,
-                              bool discardChanges = false);
+                              bool discardChanges = false) wxOVERRIDE;
 
-    virtual void EnableBellOnNoMatch(bool on = true);
+    virtual void EnableBellOnNoMatch(bool on = true) wxOVERRIDE;
 
-    virtual void SortChildren(const wxTreeItemId& item);
+    virtual void SortChildren(const wxTreeItemId& item) wxOVERRIDE;
 
     // items geometry
     // --------------
 
     virtual bool GetBoundingRect(const wxTreeItemId& item,
                                  wxRect& rect,
-                                 bool textOnly = false) const;
+                                 bool textOnly = false) const wxOVERRIDE;
 
 
     // this version specific methods
@@ -194,12 +194,12 @@ public:
     // implementation only from now on
 
     // overridden base class virtuals
-    virtual bool SetBackgroundColour(const wxColour& colour);
+    virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
-    virtual bool SetForegroundColour(const wxColour& colour);
+    virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
 
-    virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL);
+    virtual void Refresh(bool eraseBackground = true, const wxRect *rect = NULL) wxOVERRIDE;
 
-    virtual bool SetFont( const wxFont &font );
+    virtual bool SetFont( const wxFont &font ) wxOVERRIDE;
     virtual void SetWindowStyle(const long styles);
 
     // callbacks
@@ -211,9 +211,9 @@ public:
     void OnMouse( wxMouseEvent &event );
     void OnGetToolTip( wxTreeEvent &event );
     void OnSize( wxSizeEvent &event );
-    void OnInternalIdle( );
+    void OnInternalIdle( ) wxOVERRIDE;
 
-    virtual wxVisualAttributes GetDefaultAttributes() const
+    virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
     {
         return GetClassDefaultAttributes(GetWindowVariant());
     }
@@ -281,7 +281,7 @@ protected:
     void Init();
 
     // overridden wxWindow methods
-    virtual void DoThaw();
+    virtual void DoThaw() wxOVERRIDE;
 
     // misc helpers
     void SendDeleteEvent(wxGenericTreeItem *itemBeingDeleted);
@@ -294,21 +294,21 @@ protected:
                       bool unselect_others = true,
                       bool extended_select = false);
 
-    virtual int DoGetItemState(const wxTreeItemId& item) const;
+    virtual int DoGetItemState(const wxTreeItemId& item) const wxOVERRIDE;
-    virtual void DoSetItemState(const wxTreeItemId& item, int state);
+    virtual void DoSetItemState(const wxTreeItemId& item, int state) wxOVERRIDE;
 
     virtual wxTreeItemId DoInsertItem(const wxTreeItemId& parent,
                                       size_t previous,
                                       const wxString& text,
                                       int image,
                                       int selectedImage,
-                                      wxTreeItemData *data);
+                                      wxTreeItemData *data) wxOVERRIDE;
     virtual wxTreeItemId DoInsertAfter(const wxTreeItemId& parent,
                                        const wxTreeItemId& idPrevious,
                                        const wxString& text,
                                        int image = -1, int selImage = -1,
-                                       wxTreeItemData *data = NULL);
+                                       wxTreeItemData *data = NULL) wxOVERRIDE;
-    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const;
+    virtual wxTreeItemId DoTreeHitTest(const wxPoint& point, int& flags) const wxOVERRIDE;
 
     // called by wxTextTreeCtrl when it marks itself for deletion
     void ResetTextControl();
@@ -348,7 +348,7 @@ protected:
 
     void DoDirtyProcessing();
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 private:
     // Reset the state of the last find (i.e. keyboard incremental search)

include/wx/generic/wizard.h

@@ -46,13 +46,13 @@ public:
     virtual ~wxWizard();
 
     // implement base class pure virtuals
-    virtual bool RunWizard(wxWizardPage *firstPage);
+    virtual bool RunWizard(wxWizardPage *firstPage) wxOVERRIDE;
-    virtual wxWizardPage *GetCurrentPage() const;
+    virtual wxWizardPage *GetCurrentPage() const wxOVERRIDE;
-    virtual void SetPageSize(const wxSize& size);
+    virtual void SetPageSize(const wxSize& size) wxOVERRIDE;
-    virtual wxSize GetPageSize() const;
+    virtual wxSize GetPageSize() const wxOVERRIDE;
-    virtual void FitToPage(const wxWizardPage *firstPage);
+    virtual void FitToPage(const wxWizardPage *firstPage) wxOVERRIDE;
-    virtual wxSizer *GetPageAreaSizer() const;
+    virtual wxSizer *GetPageAreaSizer() const wxOVERRIDE;
-    virtual void SetBorder(int border);
+    virtual void SetBorder(int border) wxOVERRIDE;
 
     /// set/get bitmap
     const wxBitmap& GetBitmap() const { return m_bitmap; }
@@ -74,7 +74,7 @@ public:
     virtual void DoCreateControls();
 
     // Do the adaptation
-    virtual bool DoLayoutAdaptation();
+    virtual bool DoLayoutAdaptation() wxOVERRIDE;
 
     // Set/get bitmap background colour
     void SetBitmapBackgroundColour(const wxColour& colour) { m_bitmapBackgroundColour = colour; }

include/wx/gifdecod.h

@@ -57,12 +57,12 @@ public:
     unsigned char* GetPalette(unsigned int frame) const;
     unsigned int GetNcolours(unsigned int frame) const;
     int GetTransparentColourIndex(unsigned int frame) const;
-    wxColour GetTransparentColour(unsigned int frame) const;
+    wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE;
 
-    virtual wxSize GetFrameSize(unsigned int frame) const;
+    virtual wxSize GetFrameSize(unsigned int frame) const wxOVERRIDE;
-    virtual wxPoint GetFramePosition(unsigned int frame) const;
+    virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE;
-    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE;
-    virtual long GetDelay(unsigned int frame) const;
+    virtual long GetDelay(unsigned int frame) const wxOVERRIDE;
 
     // GIFs can contain both static images and animations
     bool IsAnimation() const
@@ -75,19 +75,19 @@ public:
     void Destroy();
 
     // implementation of wxAnimationDecoder's pure virtuals
-    virtual bool Load( wxInputStream& stream )
+    virtual bool Load( wxInputStream& stream ) wxOVERRIDE
         { return LoadGIF(stream) == wxGIF_OK; }
 
-    bool ConvertToImage(unsigned int frame, wxImage *image) const;
+    bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE;
 
-    wxAnimationDecoder *Clone() const
+    wxAnimationDecoder *Clone() const wxOVERRIDE
         { return new wxGIFDecoder; }
-    wxAnimationType GetType() const
+    wxAnimationType GetType() const wxOVERRIDE
         { return wxANIMATION_TYPE_GIF; }
 
 private:
     // wxAnimationDecoder pure virtual
-    virtual bool DoCanRead( wxInputStream& stream ) const;
+    virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
         // modifies current stream position (see wxAnimationDecoder::CanRead)
 
     int getcode(wxInputStream& stream, int bits, int abfin);

include/wx/graphics.h

@@ -125,8 +125,8 @@ public:
     wxGraphicsRenderer* GetRenderer() const;
     wxGraphicsObjectRefData* GetGraphicsData() const;
 protected:
-    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CreateRefData() const wxOVERRIDE;
-    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const wxOVERRIDE;
 
     DECLARE_DYNAMIC_CLASS(wxGraphicsObject)
 };

include/wx/gtk/animate.h

@@ -34,23 +34,23 @@ public:
 
     wxAnimation& operator= (const wxAnimation&);
 
-    virtual bool IsOk() const
+    virtual bool IsOk() const wxOVERRIDE
         { return m_pixbuf != NULL; }
 
 
     // unfortunately GdkPixbufAnimation does not expose these info:
 
-    virtual unsigned int GetFrameCount() const { return 0; }
+    virtual unsigned int GetFrameCount() const wxOVERRIDE { return 0; }
-    virtual wxImage GetFrame(unsigned int frame) const;
+    virtual wxImage GetFrame(unsigned int frame) const wxOVERRIDE;
 
     // we can retrieve the delay for a frame only after building
     // a GdkPixbufAnimationIter...
-    virtual int GetDelay(unsigned int WXUNUSED(frame)) const { return 0; }
+    virtual int GetDelay(unsigned int WXUNUSED(frame)) const wxOVERRIDE { return 0; }
 
-    virtual wxSize GetSize() const;
+    virtual wxSize GetSize() const wxOVERRIDE;
 
-    virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY);
+    virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
-    virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY);
+    virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
 
     // Implementation
 public:     // used by GTK callbacks
@@ -109,24 +109,24 @@ public:     // event handler
 
 public:     // public API
 
-    virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY);
+    virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
-    virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY);
+    virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
 
-    virtual void SetAnimation(const wxAnimation &anim);
+    virtual void SetAnimation(const wxAnimation &anim) wxOVERRIDE;
-    virtual wxAnimation GetAnimation() const
+    virtual wxAnimation GetAnimation() const wxOVERRIDE
         { return wxAnimation(m_anim); }
 
-    virtual bool Play();
+    virtual bool Play() wxOVERRIDE;
-    virtual void Stop();
+    virtual void Stop() wxOVERRIDE;
 
-    virtual bool IsPlaying() const;
+    virtual bool IsPlaying() const wxOVERRIDE;
 
-    bool SetBackgroundColour( const wxColour &colour );
+    bool SetBackgroundColour( const wxColour &colour ) wxOVERRIDE;
 
 protected:
 
-    virtual void DisplayStaticImage();
+    virtual void DisplayStaticImage() wxOVERRIDE;
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
     void FitToAnimation();
     void ClearToBackgroundColour();
 

include/wx/gtk/anybutton.h

@@ -23,7 +23,7 @@ public:
         m_isPressed = false;
     }
 
-    virtual bool Enable( bool enable = true );
+    virtual bool Enable( bool enable = true ) wxOVERRIDE;
 
     // implementation
     // --------------
@@ -39,11 +39,11 @@ public:
     void GTKReleased();
 
 protected:
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
 
-    virtual wxBitmap DoGetBitmap(State which) const;
+    virtual wxBitmap DoGetBitmap(State which) const wxOVERRIDE;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which) wxOVERRIDE;
-    virtual void DoSetBitmapPosition(wxDirection dir);
+    virtual void DoSetBitmapPosition(wxDirection dir) wxOVERRIDE;
 
 private:
     typedef wxAnyButtonBase base_type;

include/wx/gtk/app.h

@@ -31,20 +31,20 @@ public:
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
      * default. when overriding this method, the code in it is likely to be
      * platform dependent, otherwise use OnInit(). */
-    virtual bool SetNativeTheme(const wxString& theme);
+    virtual bool SetNativeTheme(const wxString& theme) wxOVERRIDE;
-    virtual bool OnInitGui();
+    virtual bool OnInitGui() wxOVERRIDE;
 
     // override base class (pure) virtuals
-    virtual void WakeUpIdle();
+    virtual void WakeUpIdle() wxOVERRIDE;
 
-    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
-    virtual void CleanUp();
+    virtual void CleanUp() wxOVERRIDE;
 
     virtual void OnAssertFailure(const wxChar *file,
                                  int line,
                                  const wxChar *func,
                                  const wxChar *cond,
-                                 const wxChar *msg);
+                                 const wxChar *msg) wxOVERRIDE;
 
     // GTK-specific methods
     // -------------------

include/wx/gtk/bitmap.h

@@ -43,9 +43,9 @@ public:
 #endif
 
 protected:
-    virtual void FreeData();
+    virtual void FreeData() wxOVERRIDE;
-    virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour);
+    virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour) wxOVERRIDE;
-    virtual bool InitFromMonoBitmap(const wxBitmap& bitmap);
+    virtual bool InitFromMonoBitmap(const wxBitmap& bitmap) wxOVERRIDE;
 
 private:
 #ifdef __WXGTK3__
@@ -83,36 +83,36 @@ public:
     wxBitmap(GdkPixbuf* pixbuf, int depth = 0);
     virtual ~wxBitmap();
 
-    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE;
-    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) wxOVERRIDE
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
     bool Create(int width, int height, const wxDC& WXUNUSED(dc))
         { return Create(width,height); }
     
 
-    virtual int GetHeight() const;
+    virtual int GetHeight() const wxOVERRIDE;
-    virtual int GetWidth() const;
+    virtual int GetWidth() const wxOVERRIDE;
-    virtual int GetDepth() const;
+    virtual int GetDepth() const wxOVERRIDE;
 
 #if wxUSE_IMAGE
-    wxImage ConvertToImage() const;
+    wxImage ConvertToImage() const wxOVERRIDE;
 #endif // wxUSE_IMAGE
 
     // copies the contents and mask of the given (colour) icon to the bitmap
-    virtual bool CopyFromIcon(const wxIcon& icon);
+    virtual bool CopyFromIcon(const wxIcon& icon) wxOVERRIDE;
 
-    wxMask *GetMask() const;
+    wxMask *GetMask() const wxOVERRIDE;
-    void SetMask( wxMask *mask );
+    void SetMask( wxMask *mask ) wxOVERRIDE;
 
-    wxBitmap GetSubBitmap( const wxRect& rect ) const;
+    wxBitmap GetSubBitmap( const wxRect& rect ) const wxOVERRIDE;
 
     bool SaveFile(const wxString &name, wxBitmapType type,
-                          const wxPalette *palette = NULL) const;
+                          const wxPalette *palette = NULL) const wxOVERRIDE;
-    bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
+    bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE) wxOVERRIDE;
 
 #if wxUSE_PALETTE
-    wxPalette *GetPalette() const;
+    wxPalette *GetPalette() const wxOVERRIDE;
-    void SetPalette(const wxPalette& palette);
+    void SetPalette(const wxPalette& palette) wxOVERRIDE;
     wxPalette *GetColourMap() const { return GetPalette(); }
 #endif // wxUSE_PALETTE
 
@@ -121,9 +121,9 @@ public:
     // implementation
     // --------------
 
-    void SetHeight( int height );
+    void SetHeight( int height ) wxOVERRIDE;
-    void SetWidth( int width );
+    void SetWidth( int width ) wxOVERRIDE;
-    void SetDepth( int depth );
+    void SetDepth( int depth ) wxOVERRIDE;
 
 #ifdef __WXGTK3__
     GdkPixbuf* GetPixbufNoMask() const;
@@ -151,8 +151,8 @@ protected:
 #endif // wxUSE_IMAGE
 #endif
 
-    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CreateGDIRefData() const wxOVERRIDE;
-    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const wxOVERRIDE;
 
 private:
 #ifndef __WXGTK3__

include/wx/gtk/bmpcbox.h

@@ -81,13 +81,13 @@ public:
     virtual ~wxBitmapComboBox();
 
     // Sets the image for the given item.
-    virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap);
+    virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap) wxOVERRIDE;
 
     // Returns the image of the item with the given index.
-    virtual wxBitmap GetItemBitmap(unsigned int n) const;
+    virtual wxBitmap GetItemBitmap(unsigned int n) const wxOVERRIDE;
 
     // Returns size of the image used in list
-    virtual wxSize GetBitmapSize() const
+    virtual wxSize GetBitmapSize() const wxOVERRIDE
     {
         return m_bitmapSize;
     }
@@ -106,33 +106,33 @@ public:
                unsigned int pos, wxClientData *clientData);
 
     // Override some wxTextEntry interface.
-    virtual void WriteText(const wxString& value);
+    virtual void WriteText(const wxString& value) wxOVERRIDE;
 
-    virtual wxString GetValue() const;
+    virtual wxString GetValue() const wxOVERRIDE;
-    virtual void Remove(long from, long to);
+    virtual void Remove(long from, long to) wxOVERRIDE;
 
-    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
-    virtual long GetInsertionPoint() const;
+    virtual long GetInsertionPoint() const wxOVERRIDE;
-    virtual long GetLastPosition() const;
+    virtual long GetLastPosition() const wxOVERRIDE;
 
-    virtual void SetSelection(long from, long to);
+    virtual void SetSelection(long from, long to) wxOVERRIDE;
-    virtual void GetSelection(long *from, long *to) const;
+    virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
 
-    virtual void SetSelection(int n) { wxComboBox::SetSelection(n); }
+    virtual void SetSelection(int n) wxOVERRIDE { wxComboBox::SetSelection(n); }
-    virtual int GetSelection() const { return wxComboBox::GetSelection(); }
+    virtual int GetSelection() const wxOVERRIDE { return wxComboBox::GetSelection(); }
 
-    virtual bool IsEditable() const;
+    virtual bool IsEditable() const wxOVERRIDE;
-    virtual void SetEditable(bool editable);
+    virtual void SetEditable(bool editable) wxOVERRIDE;
 
-    virtual GtkWidget* GetConnectWidget();
+    virtual GtkWidget* GetConnectWidget() wxOVERRIDE;
 
 protected:
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
 
-    virtual void GTKCreateComboBoxWidget();
+    virtual void GTKCreateComboBoxWidget() wxOVERRIDE;
-    virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
+    virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ) wxOVERRIDE;
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
     wxSize                  m_bitmapSize;
     int                     m_bitmapCellIndex;

include/wx/gtk/brush.h

@@ -28,14 +28,14 @@ public:
     bool operator==(const wxBrush& brush) const;
     bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
 
-    wxBrushStyle GetStyle() const;
+    wxBrushStyle GetStyle() const wxOVERRIDE;
-    wxColour GetColour() const;
+    wxColour GetColour() const wxOVERRIDE;
-    wxBitmap *GetStipple() const;
+    wxBitmap *GetStipple() const wxOVERRIDE;
 
-    void SetColour( const wxColour& col );
+    void SetColour( const wxColour& col ) wxOVERRIDE;
-    void SetColour( unsigned char r, unsigned char g, unsigned char b );
+    void SetColour( unsigned char r, unsigned char g, unsigned char b ) wxOVERRIDE;
-    void SetStyle( wxBrushStyle style );
+    void SetStyle( wxBrushStyle style ) wxOVERRIDE;
-    void SetStipple( const wxBitmap& stipple );
+    void SetStipple( const wxBitmap& stipple ) wxOVERRIDE;
 
     wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants")
     wxBrush(const wxColour& col, int style);
@@ -44,8 +44,8 @@ public:
     void SetStyle(int style) { SetStyle((wxBrushStyle)style); }
 
 protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CreateGDIRefData() const wxOVERRIDE;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const wxOVERRIDE;
 
     DECLARE_DYNAMIC_CLASS(wxBrush)
 };

include/wx/gtk/button.h

@@ -34,8 +34,8 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
-    virtual wxWindow *SetDefault();
+    virtual wxWindow *SetDefault() wxOVERRIDE;
-    virtual void SetLabel( const wxString &label );
+    virtual void SetLabel( const wxString &label ) wxOVERRIDE;
 
     // implementation
     // --------------
@@ -54,11 +54,11 @@ public:
     void GTKReleased();
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
 
 #if wxUSE_MARKUP
-    virtual bool DoSetLabelMarkup(const wxString& markup);
+    virtual bool DoSetLabelMarkup(const wxString& markup) wxOVERRIDE;
 #endif // wxUSE_MARKUP
 
 private:

include/wx/gtk/calctrl.h

@@ -34,16 +34,16 @@ public:
 
     virtual ~wxGtkCalendarCtrl() {}
 
-    virtual bool SetDate(const wxDateTime& date);
+    virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
-    virtual wxDateTime GetDate() const;
+    virtual wxDateTime GetDate() const wxOVERRIDE;
 
     virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
-                              const wxDateTime& upperdate = wxDefaultDateTime);
+                              const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
-    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const;
+    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
 
-    virtual bool EnableMonthChange(bool enable = true);
+    virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
 
-    virtual void Mark(size_t day, bool mark);
+    virtual void Mark(size_t day, bool mark) wxOVERRIDE;
 
     // implementation
     // --------------

include/wx/gtk/checkbox.h

@@ -35,11 +35,11 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxCheckBoxNameStr );
 
-    void SetValue( bool state );
+    void SetValue( bool state ) wxOVERRIDE;
-    bool GetValue() const;
+    bool GetValue() const wxOVERRIDE;
 
-    virtual void SetLabel( const wxString& label );
+    virtual void SetLabel( const wxString& label ) wxOVERRIDE;
-    virtual bool Enable( bool enable = true );
+    virtual bool Enable( bool enable = true ) wxOVERRIDE;
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
@@ -49,11 +49,11 @@ public:
     void GTKEnableEvents();
 
 protected:
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
 
-    void DoSet3StateValue(wxCheckBoxState state);
+    void DoSet3StateValue(wxCheckBoxState state) wxOVERRIDE;
-    wxCheckBoxState DoGet3StateValue() const;
+    wxCheckBoxState DoGet3StateValue() const wxOVERRIDE;
 
 private:
     typedef wxCheckBoxBase base_type;

include/wx/gtk/checklst.h

@@ -34,8 +34,8 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr);
 
-    virtual bool IsChecked(unsigned int index) const;
+    virtual bool IsChecked(unsigned int index) const wxOVERRIDE;
-    virtual void Check(unsigned int index, bool check = true);
+    virtual void Check(unsigned int index, bool check = true) wxOVERRIDE;
 
     int GetItemHeight() const;
 

include/wx/gtk/choice.h

@@ -63,16 +63,16 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
 
-    int GetSelection() const;
+    int GetSelection() const wxOVERRIDE;
-    void SetSelection(int n);
+    void SetSelection(int n) wxOVERRIDE;
 
-    virtual unsigned int GetCount() const;
+    virtual unsigned int GetCount() const wxOVERRIDE;
-    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual int FindString(const wxString& s, bool bCase = false) const wxOVERRIDE;
-    virtual wxString GetString(unsigned int n) const;
+    virtual wxString GetString(unsigned int n) const wxOVERRIDE;
-    virtual void SetString(unsigned int n, const wxString& string);
+    virtual void SetString(unsigned int n, const wxString& string) wxOVERRIDE;
 
-    virtual void SetColumns(int n=1);
+    virtual void SetColumns(int n=1) wxOVERRIDE;
-    virtual int GetColumns() const;
+    virtual int GetColumns() const wxOVERRIDE;
 
     virtual void GTKDisableEvents();
     virtual void GTKEnableEvents();
@@ -91,18 +91,18 @@ protected:
     // index to GtkListStore cell which displays the item text
     int m_stringCellIndex;
 
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
-    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
     virtual int DoInsertItems(const wxArrayStringsAdapter& items,
                               unsigned int pos,
-                              void **clientData, wxClientDataType type);
+                              void **clientData, wxClientDataType type) wxOVERRIDE;
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void DoSetItemClientData(unsigned int n, void* clientData) wxOVERRIDE;
-    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void* DoGetItemClientData(unsigned int n) const wxOVERRIDE;
-    virtual void DoClear();
+    virtual void DoClear() wxOVERRIDE;
-    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
 
-    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style) wxOVERRIDE;
 
     // in derived classes, implement this to insert list store entry
     // with all items default except text

include/wx/gtk/clipbrd.h

@@ -30,31 +30,31 @@ public:
     virtual ~wxClipboard();
 
     // open the clipboard before SetData() and GetData()
-    virtual bool Open();
+    virtual bool Open() wxOVERRIDE;
 
     // close the clipboard after SetData() and GetData()
-    virtual void Close();
+    virtual void Close() wxOVERRIDE;
 
     // query whether the clipboard is opened
-    virtual bool IsOpened() const;
+    virtual bool IsOpened() const wxOVERRIDE;
 
     // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
+    virtual bool SetData( wxDataObject *data ) wxOVERRIDE;
 
     // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
+    virtual bool AddData( wxDataObject *data ) wxOVERRIDE;
 
     // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
+    virtual bool IsSupported( const wxDataFormat& format ) wxOVERRIDE;
 
     // ask if data in correct format is available
-    virtual bool IsSupportedAsync( wxEvtHandler *sink );
+    virtual bool IsSupportedAsync( wxEvtHandler *sink ) wxOVERRIDE;
 
     // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
+    virtual bool GetData( wxDataObject& data ) wxOVERRIDE;
 
     // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
+    virtual void Clear() wxOVERRIDE;
 
 
 

include/wx/gtk/clrpicker.h

@@ -47,7 +47,7 @@ public:
     virtual ~wxColourButton();
 
 protected:
-    void UpdateColour();
+    void UpdateColour() wxOVERRIDE;
 
 public:     // used by the GTK callback only
 

include/wx/gtk/collpane.h

@@ -43,15 +43,15 @@ public:
                 const wxValidator& val = wxDefaultValidator,
                 const wxString& name = wxCollapsiblePaneNameStr);
 
-    virtual void Collapse(bool collapse = true);
+    virtual void Collapse(bool collapse = true) wxOVERRIDE;
-    virtual bool IsCollapsed() const;
+    virtual bool IsCollapsed() const wxOVERRIDE;
-    virtual void SetLabel(const wxString& str);
+    virtual void SetLabel(const wxString& str) wxOVERRIDE;
 
-    virtual wxWindow *GetPane() const { return m_pPane; }
+    virtual wxWindow *GetPane() const wxOVERRIDE { return m_pPane; }
-    virtual wxString GetLabel() const { return m_strLabel; }
+    virtual wxString GetLabel() const wxOVERRIDE { return m_strLabel; }
 
 protected:
-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestSize() const wxOVERRIDE;
 
 public:     // used by GTK callbacks
     bool m_bIgnoreNextChange;
@@ -69,8 +69,8 @@ private:
     }
 
     void OnSize(wxSizeEvent&);
-    virtual void AddChildGTK(wxWindowGTK* child);
+    virtual void AddChildGTK(wxWindowGTK* child) wxOVERRIDE;
-    GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+    GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const wxOVERRIDE;
 
     DECLARE_DYNAMIC_CLASS(wxCollapsiblePane)
     DECLARE_EVENT_TABLE()

include/wx/gtk/colordlg.h

@@ -25,16 +25,16 @@ public:
 
     wxColourData &GetColourData() { return m_data; }
 
-    virtual int ShowModal();
+    virtual int ShowModal() wxOVERRIDE;
 
 protected:
     // implement some base class methods to do nothing to avoid asserts and
     // GTK warnings, since this is not a real wxDialog.
     virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
                            int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
+                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) wxOVERRIDE {}
     virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y),
-                              int WXUNUSED(width), int WXUNUSED(height)) {}
+                              int WXUNUSED(width), int WXUNUSED(height)) wxOVERRIDE {}
 
     // copy data between the dialog and m_colourData:
     void ColourDataToDialog();

include/wx/gtk/colour.h

@@ -33,10 +33,10 @@ public:
     bool operator==(const wxColour& col) const;
     bool operator!=(const wxColour& col) const { return !(*this == col); }
 
-    unsigned char Red() const;
+    unsigned char Red() const wxOVERRIDE;
-    unsigned char Green() const;
+    unsigned char Green() const wxOVERRIDE;
-    unsigned char Blue() const;
+    unsigned char Blue() const wxOVERRIDE;
-    unsigned char Alpha() const;
+    unsigned char Alpha() const wxOVERRIDE;
 
     // Implementation part
 #ifdef __WXGTK3__
@@ -49,9 +49,9 @@ public:
 
 protected:
     virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
+    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a) wxOVERRIDE;
 
-    virtual bool FromString(const wxString& str);
+    virtual bool FromString(const wxString& str) wxOVERRIDE;
 
     DECLARE_DYNAMIC_CLASS(wxColour)
 };