Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept

Don't use deprecated macros in wxWidgets itself.

demos/bombs/bombs.h

@@ -21,7 +21,7 @@ class BombsFrame;
 class BombsApp: public wxApp
 {
 public:
-    virtual bool OnInit() wxOVERRIDE;
+    virtual bool OnInit() override;
 
 private :
     BombsFrame *m_frame;

demos/forty/canvas.h

@@ -23,7 +23,7 @@ public:
     FortyCanvas(wxWindow* parent, const wxPoint& pos, const wxSize& size);
     virtual ~FortyCanvas();
 
-    virtual void OnDraw(wxDC& dc) wxOVERRIDE;
+    virtual void OnDraw(wxDC& dc) override;
     bool OnCloseCanvas();
     void OnMouseEvent(wxMouseEvent& event);
     void SetCursorStyle(int x, int y);

demos/forty/forty.h

@@ -17,7 +17,7 @@ class FortyApp: public wxApp
 public:
     FortyApp(){}
     virtual ~FortyApp();
-    bool OnInit() wxOVERRIDE;
+    bool OnInit() override;
 
     static const wxColour& BackgroundColour();
     static const wxColour& TextColour();

demos/forty/game.h

@@ -24,11 +24,11 @@ class Pack : public Pile {
 public:
     Pack(int x, int y);
     virtual ~Pack();
-    void Redraw(wxDC& dc) wxOVERRIDE;
-    void ResetPile() wxOVERRIDE { m_topCard = NumCards - 1; }
+    void Redraw(wxDC& dc) override;
+    void ResetPile() override { m_topCard = NumCards - 1; }
     void Shuffle();
-    void AddCard(Card* card) wxOVERRIDE; // Add card
-    void AddCard(wxDC& dc, Card* card) wxOVERRIDE { AddCard(card); Redraw(dc); }
+    void AddCard(Card* card) override; // Add card
+    void AddCard(wxDC& dc, Card* card) override { AddCard(card); Redraw(dc); }
 };
 
 
@@ -39,7 +39,7 @@ class Base : public Pile {
 public:
     Base(int x, int y);
     virtual ~Base(){}
-    bool AcceptCard(Card* card) wxOVERRIDE;
+    bool AcceptCard(Card* card) override;
 };
 
 
@@ -50,7 +50,7 @@ class Foundation : public Pile {
 public:
     Foundation(int x, int y);
     virtual ~Foundation(){}
-    bool AcceptCard(Card* card) wxOVERRIDE;
+    bool AcceptCard(Card* card) override;
 };
 
 
@@ -61,9 +61,9 @@ class Discard : public Pile {
 public:
     Discard(int x, int y);
     virtual ~Discard(){}
-    void Redraw(wxDC& dc) wxOVERRIDE;
-    void GetTopCardPos(int& x, int& y) wxOVERRIDE;
-    Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset) wxOVERRIDE;
+    void Redraw(wxDC& dc) override;
+    void GetTopCardPos(int& x, int& y) override;
+    Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset) override;
 };
 
 

demos/fractal/fractal.cpp

@@ -51,7 +51,7 @@ static wxMenuBar *menuBar = NULL;
 class MyApp: public wxApp
 {
 public:
-    bool OnInit() wxOVERRIDE;
+    bool OnInit() override;
 };
 
 wxIMPLEMENT_APP(MyApp);

demos/life/game.cpp

@@ -923,8 +923,8 @@ class LifeModule: public wxModule
 
 public:
     LifeModule() {}
-    bool OnInit() wxOVERRIDE;
-    void OnExit() wxOVERRIDE;
+    bool OnInit() override;
+    void OnExit() override;
 };
 
 wxIMPLEMENT_DYNAMIC_CLASS(LifeModule, wxModule);

demos/life/life.h

@@ -153,7 +153,7 @@ private:
 class LifeApp : public wxApp
 {
 public:
-    virtual bool OnInit() wxOVERRIDE;
+    virtual bool OnInit() override;
 };
 
 #endif  // _LIFE_APP_H_

demos/poem/wxpoem.h

@@ -21,8 +21,8 @@
 class MyApp: public wxApp
 {
 public:
-    bool OnInit() wxOVERRIDE;
-    int OnExit() wxOVERRIDE;
+    bool OnInit() override;
+    int OnExit() override;
 };
 
 wxDECLARE_APP(MyApp);

include/wx/activityindicator.h

@@ -33,12 +33,12 @@ public:
     virtual bool IsRunning() const = 0;
 
     // Override some base class virtual methods.
-    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
-    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
+    virtual bool AcceptsFocus() const override { return false; }
+    virtual bool HasTransparentBackground() override { return true; }
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; }
 };
 
 #ifndef __WXUNIVERSAL__

include/wx/addremovectrl.h

@@ -90,7 +90,7 @@ public:
     void SetButtonsToolTips(const wxString& addtip, const wxString& removetip);
 
 protected:
-    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestClientSize() const override;
 
 private:
     // Common part of all ctors.

include/wx/affinematrix2d.h

@@ -28,19 +28,19 @@ public:
     }
 
     // Implement base class pure virtual methods.
-    virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) wxOVERRIDE;
-    virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const wxOVERRIDE;
-    virtual void Concat(const wxAffineMatrix2DBase& t) wxOVERRIDE;
-    virtual bool Invert() wxOVERRIDE;
-    virtual bool IsIdentity() const wxOVERRIDE;
-    virtual bool IsEqual(const wxAffineMatrix2DBase& t) const wxOVERRIDE;
-    virtual void Translate(wxDouble dx, wxDouble dy) wxOVERRIDE;
-    virtual void Scale(wxDouble xScale, wxDouble yScale) wxOVERRIDE;
-    virtual void Rotate(wxDouble cRadians) wxOVERRIDE;
+    virtual void Set(const wxMatrix2D& mat2D, const wxPoint2DDouble& tr) override;
+    virtual void Get(wxMatrix2D* mat2D, wxPoint2DDouble* tr) const override;
+    virtual void Concat(const wxAffineMatrix2DBase& t) override;
+    virtual bool Invert() override;
+    virtual bool IsIdentity() const override;
+    virtual bool IsEqual(const wxAffineMatrix2DBase& t) const override;
+    virtual void Translate(wxDouble dx, wxDouble dy) override;
+    virtual void Scale(wxDouble xScale, wxDouble yScale) override;
+    virtual void Rotate(wxDouble cRadians) override;
 
 protected:
-    virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const wxOVERRIDE;
-    virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const wxOVERRIDE;
+    virtual wxPoint2DDouble DoTransformPoint(const wxPoint2DDouble& p) const override;
+    virtual wxPoint2DDouble DoTransformDistance(const wxPoint2DDouble& p) const override;
 
 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 wxOVERRIDE;
-    virtual wxPoint GetFramePosition(unsigned int frame) const wxOVERRIDE;
-    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const wxOVERRIDE;
-    virtual long GetDelay(unsigned int frame) const wxOVERRIDE;
-    virtual wxColour GetTransparentColour(unsigned int frame) const wxOVERRIDE;
+    virtual wxSize GetFrameSize(unsigned int frame) const override;
+    virtual wxPoint GetFramePosition(unsigned int frame) const override;
+    virtual wxAnimationDisposal GetDisposalMethod(unsigned int frame) const override;
+    virtual long GetDelay(unsigned int frame) const override;
+    virtual wxColour GetTransparentColour(unsigned int frame) const override;
 
     // implementation of wxAnimationDecoder's pure virtuals
 
-    virtual bool Load( wxInputStream& stream ) wxOVERRIDE;
+    virtual bool Load( wxInputStream& stream ) override;
 
-    bool ConvertToImage(unsigned int frame, wxImage *image) const wxOVERRIDE;
+    bool ConvertToImage(unsigned int frame, wxImage *image) const override;
 
-    wxAnimationDecoder *Clone() const wxOVERRIDE
+    wxAnimationDecoder *Clone() const override
         { return new wxANIDecoder; }
-    wxAnimationType GetType() const wxOVERRIDE
+    wxAnimationType GetType() const override
         { return wxANIMATION_TYPE_ANI; }
 
 protected:
     // wxAnimationDecoder pure virtual:
-    virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
+    virtual bool DoCanRead( wxInputStream& stream ) const override;
             // modifies current stream position (see wxAnimationDecoder::CanRead)
 
 private:

include/wx/any.h

@@ -166,7 +166,7 @@ public: \
     { \
         return AreSameClasses(*sm_instance.get(), *otherType); \
     } \
-    virtual bool IsSameType(const wxAnyValueType* otherType) const wxOVERRIDE \
+    virtual bool IsSameType(const wxAnyValueType* otherType) const override \
     { \
         return IsSameClass(otherType); \
     } \
@@ -292,13 +292,13 @@ public:
     wxAnyValueTypeImplBase() : wxAnyValueType() { }
     virtual ~wxAnyValueTypeImplBase() { }
 
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const override
     {
         Ops::DeleteValue(buf);
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const wxOVERRIDE
+                            wxAnyValueBuffer& dst) const override
     {
         Ops::SetValue(Ops::GetValue(src), dst);
     }
@@ -344,7 +344,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const wxOVERRIDE
+                              wxAnyValueBuffer& dst) const override
     {
         wxUnusedVar(src);
         wxUnusedVar(dstType);
@@ -422,7 +422,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const wxOVERRIDE;
+                              wxAnyValueBuffer& dst) const override;
 };
 
 
@@ -437,7 +437,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const wxOVERRIDE;
+                              wxAnyValueBuffer& dst) const override;
 };
 
 
@@ -473,7 +473,7 @@ public: \
     virtual ~wxAnyValueTypeImpl##TYPENAME() { } \
     virtual bool ConvertValue(const wxAnyValueBuffer& src, \
                               wxAnyValueType* dstType, \
-                              wxAnyValueBuffer& dst) const wxOVERRIDE \
+                              wxAnyValueBuffer& dst) const override \
     { \
         GV value = GetValue(src); \
         return CONVFUNC(value, dstType, dst); \
@@ -526,7 +526,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const wxOVERRIDE;
+                              wxAnyValueBuffer& dst) const override;
 };
 
 //
@@ -543,7 +543,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const wxOVERRIDE;
+                              wxAnyValueBuffer& dst) const override;
 };
 
 // WX_ANY_DEFINE_SUB_TYPE requires this
@@ -571,7 +571,7 @@ public: \
  \
     virtual bool ConvertValue(const wxAnyValueBuffer& src, \
                               wxAnyValueType* dstType, \
-                              wxAnyValueBuffer& dst) const wxOVERRIDE \
+                              wxAnyValueBuffer& dst) const override \
     { \
         wxUnusedVar(src); \
         wxUnusedVar(dstType); \
@@ -620,7 +620,7 @@ public:
         wxAnyValueTypeImplBase<wxVariantData*>() { }
     virtual ~wxAnyValueTypeImplVariantData() { }
 
-    virtual void DeleteValue(wxAnyValueBuffer& buf) const wxOVERRIDE
+    virtual void DeleteValue(wxAnyValueBuffer& buf) const override
     {
         wxVariantData* data = static_cast<wxVariantData*>(buf.m_ptr);
         if ( data )
@@ -628,7 +628,7 @@ public:
     }
 
     virtual void CopyBuffer(const wxAnyValueBuffer& src,
-                            wxAnyValueBuffer& dst) const wxOVERRIDE
+                            wxAnyValueBuffer& dst) const override
     {
         wxVariantData* data = static_cast<wxVariantData*>(src.m_ptr);
         if ( data )
@@ -650,7 +650,7 @@ public:
 
     virtual bool ConvertValue(const wxAnyValueBuffer& src,
                               wxAnyValueType* dstType,
-                              wxAnyValueBuffer& dst) const wxOVERRIDE
+                              wxAnyValueBuffer& dst) const override
     {
         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 wxOVERRIDE { return false; }
+    virtual bool ShouldInheritColours() const override { return false; }
 
     // backwards compatible names for pressed/current bitmaps: they're not
     // deprecated as there is nothing really wrong with using them and no real
@@ -152,7 +152,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { 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) wxOVERRIDE;
+    virtual int FilterEvent(wxEvent& event) override;
 
     // return true if we're running event loop, i.e. if the events can
     // (already) be dispatched
@@ -567,7 +567,7 @@ public:
         // very first initialization function
         //
         // Override: very rarely
-    virtual bool Initialize(int& argc, wxChar **argv) wxOVERRIDE;
+    virtual bool Initialize(int& argc, wxChar **argv) override;
 
         // a platform-dependent version of OnInit(): the code here is likely to
         // depend on the toolkit. default version does nothing.
@@ -582,15 +582,15 @@ public:
         // of the program really starts here
         //
         // Override: rarely in GUI applications, always in console ones.
-    virtual int OnRun() wxOVERRIDE;
+    virtual int OnRun() override;
 
         // a matching function for OnInit()
-    virtual int OnExit() wxOVERRIDE;
+    virtual int OnExit() override;
 
         // very last clean up function
         //
         // Override: very rarely
-    virtual void CleanUp() wxOVERRIDE;
+    virtual void CleanUp() override;
 
 
     // the worker functions - usually not used directly by the user code
@@ -605,10 +605,10 @@ public:
         // parties
         //
         // it should return true if more idle events are needed, false if not
-    virtual bool ProcessIdle() wxOVERRIDE;
+    virtual bool ProcessIdle() override;
 
         // override base class version: GUI apps always use an event loop
-    virtual bool UsesEventLoop() const wxOVERRIDE { return true; }
+    virtual bool UsesEventLoop() const override { return true; }
 
 
     // top level window functions
@@ -675,8 +675,8 @@ public:
     // ------------------------------------------------------------------------
 
 #if wxUSE_CMDLINE_PARSER
-    virtual bool OnCmdLineParsed(wxCmdLineParser& parser) wxOVERRIDE;
-    virtual void OnInitCmdLine(wxCmdLineParser& parser) wxOVERRIDE;
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser) override;
+    virtual void OnInitCmdLine(wxCmdLineParser& parser) override;
 #endif
 
     // miscellaneous other stuff
@@ -687,7 +687,7 @@ public:
     // deactivated
     virtual void SetActive(bool isActive, wxWindow *lastFocus);
 
-    virtual bool IsGUI() const wxOVERRIDE { return true; }
+    virtual bool IsGUI() const override { return true; }
 
     // returns non-null pointer only if we have a GUI application object: this
     // is only useful in the rare cases when the same code can be used in both
@@ -702,7 +702,7 @@ public:
 
 protected:
     // override base class method to use GUI traits
-    virtual wxAppTraits *CreateTraits() wxOVERRIDE;
+    virtual wxAppTraits *CreateTraits() override;
 
     // Helper method deleting all existing top level windows: this is used
     // during the application shutdown.

include/wx/appprogress.h

@@ -42,12 +42,12 @@ private:
         {
         }
 
-        virtual bool IsAvailable() const wxOVERRIDE { return false; }
+        virtual bool IsAvailable() const override { return false; }
 
-        virtual void SetValue(int WXUNUSED(value)) wxOVERRIDE { }
-        virtual void SetRange(int WXUNUSED(range)) wxOVERRIDE { }
-        virtual void Pulse() wxOVERRIDE { }
-        virtual void Reset() wxOVERRIDE { }
+        virtual void SetValue(int WXUNUSED(value)) override { }
+        virtual void SetRange(int WXUNUSED(range)) override { }
+        virtual void Pulse() override { }
+        virtual void Reset() override { }
     };
 #endif
 

include/wx/apptrait.h

@@ -206,27 +206,27 @@ class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits
 {
 public:
 #if !wxUSE_CONSOLE_EVENTLOOP
-    virtual wxEventLoopBase *CreateEventLoop() wxOVERRIDE { return NULL; }
+    virtual wxEventLoopBase *CreateEventLoop() override { return NULL; }
 #endif // !wxUSE_CONSOLE_EVENTLOOP
 
 #if wxUSE_LOG
-    virtual wxLog *CreateLogTarget() wxOVERRIDE;
+    virtual wxLog *CreateLogTarget() override;
 #endif // wxUSE_LOG
-    virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE;
+    virtual wxMessageOutput *CreateMessageOutput() override;
 #if wxUSE_FONTMAP
-    virtual wxFontMapper *CreateFontMapper() wxOVERRIDE;
+    virtual wxFontMapper *CreateFontMapper() override;
 #endif // wxUSE_FONTMAP
-    virtual wxRendererNative *CreateRenderer() wxOVERRIDE;
+    virtual wxRendererNative *CreateRenderer() override;
 
-    virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
-    virtual bool HasStderr() wxOVERRIDE;
+    virtual bool ShowAssertDialog(const wxString& msg) override;
+    virtual bool HasStderr() override;
     virtual bool SafeMessageBox(const wxString& text,
-                                const wxString& title) wxOVERRIDE;
+                                const wxString& title) override;
 
     // the GetToolkitVersion for console application is always the same
     wxPortId GetToolkitVersion(int *verMaj = NULL,
                                int *verMin = NULL,
-                               int *verMicro = NULL) const wxOVERRIDE
+                               int *verMicro = NULL) const override
     {
         // no toolkits (wxBase is for console applications without GUI support)
         // NB: zero means "no toolkit", -1 means "not initialized yet"
@@ -237,8 +237,8 @@ public:
         return wxPORT_BASE;
     }
 
-    virtual bool IsUsingUniversalWidgets() const wxOVERRIDE { return false; }
-    virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; }
+    virtual bool IsUsingUniversalWidgets() const override { return false; }
+    virtual wxString GetDesktopEnvironment() const override { return wxEmptyString; }
 };
 
 // ----------------------------------------------------------------------------
@@ -251,25 +251,25 @@ class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits
 {
 public:
 #if wxUSE_LOG
-    virtual wxLog *CreateLogTarget() wxOVERRIDE;
+    virtual wxLog *CreateLogTarget() override;
 #endif // wxUSE_LOG
-    virtual wxMessageOutput *CreateMessageOutput() wxOVERRIDE;
+    virtual wxMessageOutput *CreateMessageOutput() override;
 #if wxUSE_FONTMAP
-    virtual wxFontMapper *CreateFontMapper() wxOVERRIDE;
+    virtual wxFontMapper *CreateFontMapper() override;
 #endif // wxUSE_FONTMAP
-    virtual wxRendererNative *CreateRenderer() wxOVERRIDE;
+    virtual wxRendererNative *CreateRenderer() override;
 
-    virtual bool ShowAssertDialog(const wxString& msg) wxOVERRIDE;
-    virtual bool HasStderr() wxOVERRIDE;
+    virtual bool ShowAssertDialog(const wxString& msg) override;
+    virtual bool HasStderr() override;
 
     // Win32 has its own implementation using native message box directly in
     // the base class, don't override it.
 #ifndef __WIN32__
     virtual bool SafeMessageBox(const wxString& text,
-                                const wxString& title) wxOVERRIDE;
+                                const wxString& title) override;
 #endif // !__WIN32__
 
-    virtual bool IsUsingUniversalWidgets() const wxOVERRIDE
+    virtual bool IsUsingUniversalWidgets() const override
     {
     #ifdef __WXUNIVERSAL__
         return true;
@@ -278,7 +278,7 @@ public:
     #endif
     }
 
-    virtual wxString GetDesktopEnvironment() const wxOVERRIDE { return wxEmptyString; }
+    virtual wxString GetDesktopEnvironment() const override { return wxEmptyString; }
 };
 
 #endif // wxUSE_GUI

include/wx/archive.h

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

include/wx/aui/auibar.h

@@ -76,7 +76,7 @@ public:
         m_isDropdownClicked = false;
         m_toolId = -1;
     }
-    wxEvent *Clone() const wxOVERRIDE { return new wxAuiToolBarEvent(*this); }
+    wxEvent *Clone() const override { return new wxAuiToolBarEvent(*this); }
 
     bool IsDropDownClicked() const  { return m_isDropdownClicked; }
     void SetDropDownClicked(bool c) { m_isDropdownClicked = c;    }
@@ -356,80 +356,80 @@ public:
     wxAuiGenericToolBarArt();
     virtual ~wxAuiGenericToolBarArt();
 
-    virtual wxAuiToolBarArt* Clone() wxOVERRIDE;
-    virtual void SetFlags(unsigned int flags) wxOVERRIDE;
-    virtual unsigned int GetFlags() wxOVERRIDE;
-    virtual void SetFont(const wxFont& font) wxOVERRIDE;
-    virtual wxFont GetFont() wxOVERRIDE;
-    virtual void SetTextOrientation(int orientation) wxOVERRIDE;
-    virtual int GetTextOrientation() wxOVERRIDE;
+    virtual wxAuiToolBarArt* Clone() override;
+    virtual void SetFlags(unsigned int flags) override;
+    virtual unsigned int GetFlags() override;
+    virtual void SetFont(const wxFont& font) override;
+    virtual wxFont GetFont() override;
+    virtual void SetTextOrientation(int orientation) override;
+    virtual int GetTextOrientation() override;
 
     virtual void DrawBackground(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawPlainBackground(wxDC& dc,
                                   wxWindow* wnd,
-                                  const wxRect& rect) wxOVERRIDE;
+                                  const wxRect& rect) override;
 
     virtual void DrawLabel(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawButton(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawDropDownButton(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawControlLabel(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxAuiToolBarItem& item,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawSeparator(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawGripper(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxRect& rect) wxOVERRIDE;
+                const wxRect& rect) override;
 
     virtual void DrawOverflowButton(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxRect& rect,
-                int state) wxOVERRIDE;
+                int state) override;
 
     virtual wxSize GetLabelSize(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxAuiToolBarItem& item) wxOVERRIDE;
+                const wxAuiToolBarItem& item) override;
 
     virtual wxSize GetToolSize(
                 wxDC& dc,
                 wxWindow* wnd,
-                const wxAuiToolBarItem& item) wxOVERRIDE;
+                const wxAuiToolBarItem& item) override;
 
-    virtual int GetElementSize(int element) wxOVERRIDE;
-    virtual void SetElementSize(int elementId, int size) wxOVERRIDE;
+    virtual int GetElementSize(int element) override;
+    virtual void SetElementSize(int elementId, int size) override;
 
     virtual int ShowDropDown(wxWindow* wnd,
-                             const wxAuiToolBarItemArray& items) wxOVERRIDE;
+                             const wxAuiToolBarItemArray& items) override;
 
-    virtual void UpdateColoursFromSystem() wxOVERRIDE;
+    virtual void UpdateColoursFromSystem() override;
 
 protected:
 
@@ -480,12 +480,12 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxAUI_TB_DEFAULT_STYLE);
 
-    virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
+    virtual void SetWindowStyleFlag(long style) override;
 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;
 
-    bool SetFont(const wxFont& font) wxOVERRIDE;
+    bool SetFont(const wxFont& font) override;
 
 
     wxAuiToolBarItem* AddTool(int toolId,
@@ -616,7 +616,7 @@ public:
     bool IsPaneValid(const wxAuiPaneInfo& pane) const;
 
     // Override to call DoIdleUpdate().
-    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE;
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) override;
 
 protected:
     void Init();

include/wx/aui/auibook.h

@@ -70,7 +70,7 @@ public:
     {
         m_dragSource = NULL;
     }
-    wxEvent *Clone() const wxOVERRIDE { return new wxAuiNotebookEvent(*this); }
+    wxEvent *Clone() const override { return new wxAuiNotebookEvent(*this); }
 
     void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; }
     wxAuiNotebook* GetDragSource() const { return m_dragSource; }
@@ -204,7 +204,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; }
 
     void OnPaint(wxPaintEvent& evt);
     void OnEraseBackground(wxEraseEvent& evt);
@@ -269,7 +269,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = 0);
 
-    void SetWindowStyleFlag(long style) wxOVERRIDE;
+    void SetWindowStyleFlag(long style) override;
     void SetArtProvider(wxAuiTabArt* art);
     wxAuiTabArt* GetArtProvider() const;
 
@@ -287,19 +287,19 @@ public:
                     bool select = false,
                     const wxBitmapBundle& bitmap = wxBitmapBundle());
 
-    bool DeletePage(size_t page) wxOVERRIDE;
-    bool RemovePage(size_t page) wxOVERRIDE;
+    bool DeletePage(size_t page) override;
+    bool RemovePage(size_t page) override;
 
-    virtual size_t GetPageCount() const wxOVERRIDE;
-    virtual wxWindow* GetPage(size_t pageIdx) const wxOVERRIDE;
-    virtual int FindPage(const wxWindow* page) const wxOVERRIDE;
+    virtual size_t GetPageCount() const override;
+    virtual wxWindow* GetPage(size_t pageIdx) const override;
+    virtual int FindPage(const wxWindow* page) const override;
 
     // This is wxAUI-specific equivalent of FindPage(), prefer to use the other
     // function.
     int GetPageIndex(wxWindow* pageWnd) const { return FindPage(pageWnd); }
 
-    bool SetPageText(size_t page, const wxString& text) wxOVERRIDE;
-    wxString GetPageText(size_t pageIdx) const wxOVERRIDE;
+    bool SetPageText(size_t page, const wxString& text) override;
+    wxString GetPageText(size_t pageIdx) const override;
 
     bool SetPageToolTip(size_t page, const wxString& text);
     wxString GetPageToolTip(size_t pageIdx) const;
@@ -307,8 +307,8 @@ public:
     bool SetPageBitmap(size_t page, const wxBitmapBundle& bitmap);
     wxBitmap GetPageBitmap(size_t pageIdx) const;
 
-    int SetSelection(size_t newPage) wxOVERRIDE;
-    int GetSelection() const wxOVERRIDE;
+    int SetSelection(size_t newPage) override;
+    int GetSelection() const override;
 
     virtual void Split(size_t page, int direction);
 
@@ -324,7 +324,7 @@ public:
     void SetMeasuringFont(const wxFont& font);
 
     // Sets the tab font
-    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
+    virtual bool SetFont(const wxFont& font) override;
 
     // Gets the tab control height
     int GetTabCtrlHeight() const;
@@ -336,28 +336,28 @@ public:
     bool ShowWindowMenu();
 
     // we do have multiple pages
-    virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
+    virtual bool HasMultiplePages() const override { return true; }
 
     // we don't want focus for ourselves
     // virtual bool AcceptsFocus() const { return false; }
 
     //wxBookCtrlBase functions
 
-    virtual void SetPageSize (const wxSize &size) wxOVERRIDE;
-    virtual int  HitTest (const wxPoint &pt, long *flags=NULL) const wxOVERRIDE;
+    virtual void SetPageSize (const wxSize &size) override;
+    virtual int  HitTest (const wxPoint &pt, long *flags=NULL) const override;
 
-    virtual int GetPageImage(size_t n) const wxOVERRIDE;
-    virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
+    virtual int GetPageImage(size_t n) const override;
+    virtual bool SetPageImage(size_t n, int imageId) override;
 
-    virtual int ChangeSelection(size_t n) wxOVERRIDE;
+    virtual int ChangeSelection(size_t n) override;
 
     virtual bool AddPage(wxWindow *page, const wxString &text, bool select,
-                         int imageId) wxOVERRIDE;
-    virtual bool DeleteAllPages() wxOVERRIDE;
+                         int imageId) override;
+    virtual bool DeleteAllPages() override;
     virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text,
-                            bool select, int imageId) wxOVERRIDE;
+                            bool select, int imageId) override;
 
-    virtual wxSize DoGetBestSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const override;
 
     wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt);
     wxAuiTabCtrl* GetActiveTabCtrl();
@@ -368,10 +368,10 @@ protected:
     void Init();
 
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; }
 
     // Redo sizing after thawing
-    virtual void DoThaw() wxOVERRIDE;
+    virtual void DoThaw() override;
 
     // these can be overridden
 
@@ -383,7 +383,7 @@ protected:
     virtual wxSize CalculateNewSplitSize();
 
     // remove the page and return a pointer to it
-    virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) wxOVERRIDE { return NULL; }
+    virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) override { return NULL; }
 
     //A general selection function
     virtual int DoModifySelection(size_t n, bool events);

include/wx/aui/barartmsw.h

@@ -15,68 +15,68 @@ class WXDLLIMPEXP_AUI wxAuiMSWToolBarArt : public wxAuiGenericToolBarArt
 public:
     wxAuiMSWToolBarArt();
 
-    virtual wxAuiToolBarArt* Clone() wxOVERRIDE;
+    virtual wxAuiToolBarArt* Clone() override;
 
     virtual void DrawBackground(
         wxDC& dc,
         wxWindow* wnd,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawLabel(
         wxDC& dc,
         wxWindow* wnd,
         const wxAuiToolBarItem& item,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawButton(
         wxDC& dc,
         wxWindow* wnd,
         const wxAuiToolBarItem& item,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawDropDownButton(
         wxDC& dc,
         wxWindow* wnd,
         const wxAuiToolBarItem& item,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawControlLabel(
         wxDC& dc,
         wxWindow* wnd,
         const wxAuiToolBarItem& item,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawSeparator(
         wxDC& dc,
         wxWindow* wnd,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawGripper(
         wxDC& dc,
         wxWindow* wnd,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     virtual void DrawOverflowButton(
         wxDC& dc,
         wxWindow* wnd,
         const wxRect& rect,
-        int state) wxOVERRIDE;
+        int state) override;
 
     virtual wxSize GetLabelSize(
         wxDC& dc,
         wxWindow* wnd,
-        const wxAuiToolBarItem& item) wxOVERRIDE;
+        const wxAuiToolBarItem& item) override;
 
     virtual wxSize GetToolSize(
         wxDC& dc,
         wxWindow* wnd,
-        const wxAuiToolBarItem& item) wxOVERRIDE;
+        const wxAuiToolBarItem& item) override;
 
-    virtual int GetElementSize(int element) wxOVERRIDE;
-    virtual void SetElementSize(int elementId, int size) wxOVERRIDE;
+    virtual int GetElementSize(int element) override;
+    virtual void SetElementSize(int elementId, int size) override;
 
     virtual int ShowDropDown(wxWindow* wnd,
-        const wxAuiToolBarItemArray& items) wxOVERRIDE;
+        const wxAuiToolBarItemArray& items) override;
 
 private:
     bool m_themed;

include/wx/aui/dockart.h

@@ -93,46 +93,46 @@ public:
 
     wxAuiDefaultDockArt();
 
-    wxAuiDockArt* Clone() wxOVERRIDE;
-    int GetMetric(int metricId) wxOVERRIDE;
-    void SetMetric(int metricId, int newVal) wxOVERRIDE;
-    wxColour GetColour(int id) wxOVERRIDE;
-    void SetColour(int id, const wxColor& colour) wxOVERRIDE;
-    void SetFont(int id, const wxFont& font) wxOVERRIDE;
-    wxFont GetFont(int id) wxOVERRIDE;
+    wxAuiDockArt* Clone() override;
+    int GetMetric(int metricId) override;
+    void SetMetric(int metricId, int newVal) override;
+    wxColour GetColour(int id) override;
+    void SetColour(int id, const wxColor& colour) override;
+    void SetFont(int id, const wxFont& font) override;
+    wxFont GetFont(int id) override;
 
     void DrawSash(wxDC& dc,
                   wxWindow *window,
                   int orientation,
-                  const wxRect& rect) wxOVERRIDE;
+                  const wxRect& rect) override;
 
     void DrawBackground(wxDC& dc,
                   wxWindow *window,
                   int orientation,
-                  const wxRect& rect) wxOVERRIDE;
+                  const wxRect& rect) override;
 
     void DrawCaption(wxDC& dc,
                   wxWindow *window,
                   const wxString& text,
                   const wxRect& rect,
-                  wxAuiPaneInfo& pane) wxOVERRIDE;
+                  wxAuiPaneInfo& pane) override;
 
     void DrawGripper(wxDC& dc,
                   wxWindow *window,
                   const wxRect& rect,
-                  wxAuiPaneInfo& pane) wxOVERRIDE;
+                  wxAuiPaneInfo& pane) override;
 
     void DrawBorder(wxDC& dc,
                   wxWindow *window,
                   const wxRect& rect,
-                  wxAuiPaneInfo& pane) wxOVERRIDE;
+                  wxAuiPaneInfo& pane) override;
 
     void DrawPaneButton(wxDC& dc,
                   wxWindow *window,
                   int button,
                   int buttonState,
                   const wxRect& rect,
-                  wxAuiPaneInfo& pane) wxOVERRIDE;
+                  wxAuiPaneInfo& pane) override;
 
 #if WXWIN_COMPATIBILITY_3_0
     wxDEPRECATED_MSG("This is not intended for the public API")
@@ -141,7 +141,7 @@ public:
                   wxAuiPaneInfo& pane);
 #endif
 
-    virtual void UpdateColoursFromSystem() wxOVERRIDE;
+    virtual void UpdateColoursFromSystem() override;
 
 
 protected:

include/wx/aui/floatpane.h

@@ -44,7 +44,7 @@ public:
     wxAuiManager* GetOwnerManager() const;
 
     // Allow processing accelerators to the parent frame
-    virtual bool IsTopNavigationDomain(NavigationKind kind) const wxOVERRIDE;
+    virtual bool IsTopNavigationDomain(NavigationKind kind) const override;
 
     wxAuiManager& GetAuiManager()  { return m_mgr; }
 

include/wx/aui/framemanager.h

@@ -637,7 +637,7 @@ public:
         canveto_flag = true;
         dc = NULL;
     }
-    wxEvent *Clone() const wxOVERRIDE { return new wxAuiManagerEvent(*this); }
+    wxEvent *Clone() const override { return new wxAuiManagerEvent(*this); }
 
     void SetManager(wxAuiManager* mgr) { manager = mgr; }
     void SetPane(wxAuiPaneInfo* p) { pane = p; }

include/wx/aui/tabart.h

@@ -124,27 +124,27 @@ public:
     wxAuiGenericTabArt();
     virtual ~wxAuiGenericTabArt();
 
-    wxAuiTabArt* Clone() wxOVERRIDE;
-    void SetFlags(unsigned int flags) wxOVERRIDE;
+    wxAuiTabArt* Clone() override;
+    void SetFlags(unsigned int flags) override;
     void SetSizingInfo(const wxSize& tabCtrlSize,
                        size_t tabCount,
-                       wxWindow* wnd = NULL) wxOVERRIDE;
+                       wxWindow* wnd = NULL) override;
 
-    void SetNormalFont(const wxFont& font) wxOVERRIDE;
-    void SetSelectedFont(const wxFont& font) wxOVERRIDE;
-    void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
-    void SetColour(const wxColour& colour) wxOVERRIDE;
-    void SetActiveColour(const wxColour& colour) wxOVERRIDE;
+    void SetNormalFont(const wxFont& font) override;
+    void SetSelectedFont(const wxFont& font) override;
+    void SetMeasuringFont(const wxFont& font) override;
+    void SetColour(const wxColour& colour) override;
+    void SetActiveColour(const wxColour& colour) override;
 
     void DrawBorder(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect) wxOVERRIDE;
+                 const wxRect& rect) override;
 
     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect) wxOVERRIDE;
+                 const wxRect& rect) override;
 
     void DrawTab(wxDC& dc,
                  wxWindow* wnd,
@@ -153,7 +153,7 @@ public:
                  int closeButtonState,
                  wxRect* outTabRect,
                  wxRect* outButtonRect,
-                 int* xExtent) wxOVERRIDE;
+                 int* xExtent) override;
 
     void DrawButton(
                  wxDC& dc,
@@ -162,15 +162,15 @@ public:
                  int bitmapId,
                  int buttonState,
                  int orientation,
-                 wxRect* outRect) wxOVERRIDE;
+                 wxRect* outRect) override;
 
-    int GetIndentSize() wxOVERRIDE;
+    int GetIndentSize() override;
 
     int GetBorderWidth(
-                 wxWindow* wnd) wxOVERRIDE;
+                 wxWindow* wnd) override;
 
     int GetAdditionalBorderSpace(
-                 wxWindow* wnd) wxOVERRIDE;
+                 wxWindow* wnd) override;
 
     wxSize GetTabSize(
                  wxDC& dc,
@@ -179,19 +179,19 @@ public:
                  const wxBitmapBundle& bitmap,
                  bool active,
                  int closeButtonState,
-                 int* xExtent) wxOVERRIDE;
+                 int* xExtent) override;
 
     int ShowDropDown(
                  wxWindow* wnd,
                  const wxAuiNotebookPageArray& items,
-                 int activeIdx) wxOVERRIDE;
+                 int activeIdx) override;
 
     int GetBestTabCtrlSize(wxWindow* wnd,
                  const wxAuiNotebookPageArray& pages,
-                 const wxSize& requiredBmpSize) wxOVERRIDE;
+                 const wxSize& requiredBmpSize) override;
 
     // Provide opportunity for subclasses to recalculate colours
-    virtual void UpdateColoursFromSystem() wxOVERRIDE;
+    virtual void UpdateColoursFromSystem() override;
 
 protected:
 
@@ -226,28 +226,28 @@ public:
     wxAuiSimpleTabArt();
     virtual ~wxAuiSimpleTabArt();
 
-    wxAuiTabArt* Clone() wxOVERRIDE;
-    void SetFlags(unsigned int flags) wxOVERRIDE;
+    wxAuiTabArt* Clone() override;
+    void SetFlags(unsigned int flags) override;
 
     void SetSizingInfo(const wxSize& tabCtrlSize,
                        size_t tabCount,
-                       wxWindow* wnd = NULL) wxOVERRIDE;
+                       wxWindow* wnd = NULL) override;
 
-    void SetNormalFont(const wxFont& font) wxOVERRIDE;
-    void SetSelectedFont(const wxFont& font) wxOVERRIDE;
-    void SetMeasuringFont(const wxFont& font) wxOVERRIDE;
-    void SetColour(const wxColour& colour) wxOVERRIDE;
-    void SetActiveColour(const wxColour& colour) wxOVERRIDE;
+    void SetNormalFont(const wxFont& font) override;
+    void SetSelectedFont(const wxFont& font) override;
+    void SetMeasuringFont(const wxFont& font) override;
+    void SetColour(const wxColour& colour) override;
+    void SetActiveColour(const wxColour& colour) override;
 
     void DrawBorder(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect) wxOVERRIDE;
+                 const wxRect& rect) override;
 
     void DrawBackground(
                  wxDC& dc,
                  wxWindow* wnd,
-                 const wxRect& rect) wxOVERRIDE;
+                 const wxRect& rect) override;
 
     void DrawTab(wxDC& dc,
                  wxWindow* wnd,
@@ -256,7 +256,7 @@ public:
                  int closeButtonState,
                  wxRect* outTabRect,
                  wxRect* outButtonRect,
-                 int* xExtent) wxOVERRIDE;
+                 int* xExtent) override;
 
     void DrawButton(
                  wxDC& dc,
@@ -265,15 +265,15 @@ public:
                  int bitmapId,
                  int buttonState,
                  int orientation,
-                 wxRect* outRect) wxOVERRIDE;
+                 wxRect* outRect) override;
 
-    int GetIndentSize() wxOVERRIDE;
+    int GetIndentSize() override;
 
     int GetBorderWidth(
-                 wxWindow* wnd) wxOVERRIDE;
+                 wxWindow* wnd) override;
 
     int GetAdditionalBorderSpace(
-                 wxWindow* wnd) wxOVERRIDE;
+                 wxWindow* wnd) override;
 
     wxSize GetTabSize(
                  wxDC& dc,
@@ -282,16 +282,16 @@ public:
                  const wxBitmapBundle& bitmap,
                  bool active,
                  int closeButtonState,
-                 int* xExtent) wxOVERRIDE;
+                 int* xExtent) override;
 
     int ShowDropDown(
                  wxWindow* wnd,
                  const wxAuiNotebookPageArray& items,
-                 int activeIdx) wxOVERRIDE;
+                 int activeIdx) override;
 
     int GetBestTabCtrlSize(wxWindow* wnd,
                  const wxAuiNotebookPageArray& pages,
-                 const wxSize& requiredBmpSize) wxOVERRIDE;
+                 const wxSize& requiredBmpSize) override;
 
 protected:
 

include/wx/aui/tabartgtk.h

@@ -31,9 +31,9 @@ class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt
 public:
     wxAuiGtkTabArt();
 
-    virtual wxAuiTabArt* Clone() wxOVERRIDE;
-    virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
-    virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) wxOVERRIDE;
+    virtual wxAuiTabArt* Clone() override;
+    virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect) override;
+    virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect) override;
     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) wxOVERRIDE;
+                         int* x_extent) override;
     void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id,
-                    int button_state, int orientation, wxRect* out_rect) wxOVERRIDE;
+                    int button_state, int orientation, wxRect* out_rect) override;
     int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages,
-                            const wxSize& required_bmp_size) wxOVERRIDE;
-    int GetBorderWidth(wxWindow* wnd) wxOVERRIDE;
-    int GetAdditionalBorderSpace(wxWindow* wnd) wxOVERRIDE;
+                            const wxSize& required_bmp_size) override;
+    int GetBorderWidth(wxWindow* wnd) override;
+    int GetAdditionalBorderSpace(wxWindow* wnd) override;
     virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption,
                               const wxBitmapBundle& bitmap, bool active,
-                              int close_button_state, int* x_extent) wxOVERRIDE;
+                              int close_button_state, int* x_extent) override;
 };
 
 #endif  // wxUSE_AUI

include/wx/aui/tabartmsw.h

@@ -18,17 +18,17 @@ public:
     wxAuiMSWTabArt();
     virtual ~wxAuiMSWTabArt();
 
-    wxAuiTabArt* Clone() wxOVERRIDE;
+    wxAuiTabArt* Clone() override;
 
     void DrawBorder(
         wxDC& dc,
         wxWindow* wnd,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     void DrawBackground(
         wxDC& dc,
         wxWindow* wnd,
-        const wxRect& rect) wxOVERRIDE;
+        const wxRect& rect) override;
 
     void DrawTab(wxDC& dc,
         wxWindow* wnd,
@@ -37,7 +37,7 @@ public:
         int closeButtonState,
         wxRect* outTabRect,
         wxRect* outButtonRect,
-        int* xExtent) wxOVERRIDE;
+        int* xExtent) override;
 
     void DrawButton(
         wxDC& dc,
@@ -46,15 +46,15 @@ public:
         int bitmapId,
         int buttonState,
         int orientation,
-        wxRect* outRect) wxOVERRIDE;
+        wxRect* outRect) override;
 
-    int GetIndentSize() wxOVERRIDE;
+    int GetIndentSize() override;
 
     int GetBorderWidth(
-        wxWindow* wnd) wxOVERRIDE;
+        wxWindow* wnd) override;
 
     int GetAdditionalBorderSpace(
-        wxWindow* wnd) wxOVERRIDE;
+        wxWindow* wnd) override;
 
     wxSize GetTabSize(
         wxDC& dc,
@@ -63,16 +63,16 @@ public:
         const wxBitmapBundle& bitmap,
         bool active,
         int closeButtonState,
-        int* xExtent) wxOVERRIDE;
+        int* xExtent) override;
 
     int ShowDropDown(
         wxWindow* wnd,
         const wxAuiNotebookPageArray& items,
-        int activeIdx) wxOVERRIDE;
+        int activeIdx) override;
 
     int GetBestTabCtrlSize(wxWindow* wnd,
         const wxAuiNotebookPageArray& pages,
-        const wxSize& requiredBmpSize) wxOVERRIDE;
+        const wxSize& requiredBmpSize) override;
 
 private:
     bool m_themed;

include/wx/aui/tabmdi.h

@@ -66,7 +66,7 @@ public:
     wxMenu* GetWindowMenu() const { return m_pWindowMenu; }
     void SetWindowMenu(wxMenu* pMenu);
 
-    virtual void SetMenuBar(wxMenuBar *pMenuBar) wxOVERRIDE;
+    virtual void SetMenuBar(wxMenuBar *pMenuBar) override;
 #endif // wxUSE_MENUS
 
     void SetChildMenuBar(wxAuiMDIChildFrame *pChild);
@@ -103,9 +103,9 @@ protected:
     void DoHandleUpdateUI(wxUpdateUIEvent &event);
 #endif // wxUSE_MENUS
 
-    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
+    virtual bool ProcessEvent(wxEvent& event) override;
 
-    virtual void DoGetClientSize(int *width, int *height) const wxOVERRIDE;
+    virtual void DoGetClientSize(int *width, int *height) const override;
 
 private:
     void OnClose(wxCloseEvent& event);
@@ -143,18 +143,18 @@ public:
                 const wxString& name = wxASCII_STR(wxFrameNameStr));
 
 #if wxUSE_MENUS
-    virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE;
-    virtual wxMenuBar *GetMenuBar() const wxOVERRIDE;
+    virtual void SetMenuBar(wxMenuBar *menuBar) override;
+    virtual wxMenuBar *GetMenuBar() const override;
 #endif // wxUSE_MENUS
 
-    virtual void SetTitle(const wxString& title) wxOVERRIDE;
+    virtual void SetTitle(const wxString& title) override;
 
-    virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
+    virtual void SetIcons(const wxIconBundle& icons) override;
 
-    virtual void Activate() wxOVERRIDE;
-    virtual bool Destroy() wxOVERRIDE;
+    virtual void Activate() override;
+    virtual bool Destroy() override;
 
-    virtual bool Show(bool show = true) wxOVERRIDE;
+    virtual bool Show(bool show = true) override;
 
     void OnMenuHighlight(wxMenuEvent& evt);
 

include/wx/bannerwindow.h

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

include/wx/bookctrl.h

@@ -224,10 +224,10 @@ public:
 
 
     // we do have multiple pages
-    virtual bool HasMultiplePages() const wxOVERRIDE { return true; }
+    virtual bool HasMultiplePages() const override { return true; }
 
     // returns true if the platform should explicitly apply a theme border
-    virtual bool CanApplyThemeBorder() const wxOVERRIDE { return false; }
+    virtual bool CanApplyThemeBorder() const override { return false; }
 
 
     // Implementation only from now on.
@@ -246,7 +246,7 @@ protected:
     };
 
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { 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
@@ -314,7 +314,7 @@ protected:
     virtual wxWindow *DoRemovePage(size_t page) = 0;
 
     // our best size is the size which fits all our pages
-    virtual wxSize DoGetBestSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const override;
 
     // helper: get the next page wrapping if we reached the end
     int GetNextPage(bool forward) const;
@@ -325,7 +325,7 @@ protected:
     // It is better to make this control transparent so that by default the controls on
     // its pages are on the same colour background as the rest of the window. If the user
     // prefers a coloured background they can set the background colour on the page panel
-    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
+    virtual bool HasTransparentBackground() override { return true; }
 
     // This method also invalidates the size of the controller and should be
     // called instead of just InvalidateBestSize() whenever pages are added or
@@ -402,7 +402,7 @@ public:
         m_nOldSel = event.m_nOldSel;
     }
 
-    virtual wxEvent *Clone() const wxOVERRIDE { return new wxBookCtrlEvent(*this); }
+    virtual wxEvent *Clone() const override { return new wxBookCtrlEvent(*this); }
 
     // accessors
         // the currently selected page (wxNOT_FOUND if none)

include/wx/calctrl.h

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

include/wx/catch_cppunit.h

@@ -157,7 +157,7 @@ public:
     void addTest(Test* test) { m_tests.push_back(test); }
     size_t getChildTestCount() const { return m_tests.size(); }
 
-    void runTest() wxOVERRIDE
+    void runTest() override
     {
         for ( size_t n = 0; n < m_tests.size(); ++n )
         {
@@ -226,7 +226,7 @@ inline std::string wxGetCurrentTestName()
 // below and there just doesn't seem to be any way around it.
 #define CPPUNIT_TEST_SUITE(testclass)   \
     public:                             \
-    void runTest() wxOVERRIDE           \
+    void runTest() override           \
     {                                   \
         using namespace wxPrivate;      \
         TempStringAssign setClass(wxTheCurrentTestClass, #testclass)

include/wx/checkbox.h

@@ -97,7 +97,7 @@ public:
         return HasFlag(wxCHK_ALLOW_3RD_STATE_FOR_USER);
     }
 
-    virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
+    virtual bool HasTransparentBackground() override { return true; }
 
     // This semi-private function is currently used to allow wxMSW checkbox to
     // blend in with its parent background colour without changing the
@@ -105,7 +105,7 @@ public:
     virtual void SetTransparentPartColour(const wxColour& WXUNUSED(col)) { }
 
     // wxCheckBox-specific processing after processing the update event
-    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) wxOVERRIDE
+    virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override
     {
         wxControl::DoUpdateWindowUI(event);
 
@@ -115,7 +115,7 @@ public:
 
 protected:
     // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { 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) wxOVERRIDE;
+    void Command(wxCommandEvent& event) override;
 
     // override wxItemContainer::IsSorted
-    virtual bool IsSorted() const wxOVERRIDE { return HasFlag(wxCB_SORT); }
+    virtual bool IsSorted() const override { 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 wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const override;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxChoiceBase);

include/wx/choicebk.h

@@ -60,37 +60,37 @@ public:
                 const wxString& name = wxEmptyString);
 
 
-    virtual bool SetPageText(size_t n, const wxString& strText) wxOVERRIDE;
-    virtual wxString GetPageText(size_t n) const wxOVERRIDE;
-    virtual int GetPageImage(size_t n) const wxOVERRIDE;
-    virtual bool SetPageImage(size_t n, int imageId) wxOVERRIDE;
+    virtual bool SetPageText(size_t n, const wxString& strText) override;
+    virtual wxString GetPageText(size_t n) const override;
+    virtual int GetPageImage(size_t n) const override;
+    virtual bool SetPageImage(size_t n, int imageId) override;
     virtual bool InsertPage(size_t n,
                             wxWindow *page,
                             const wxString& text,
                             bool bSelect = false,
-                            int imageId = NO_IMAGE) wxOVERRIDE;
-    virtual int SetSelection(size_t n) wxOVERRIDE
+                            int imageId = NO_IMAGE) override;
+    virtual int SetSelection(size_t n) override
         { return DoSetSelection(n, SetSelection_SendEvent); }
-    virtual int ChangeSelection(size_t n) wxOVERRIDE { return DoSetSelection(n); }
-    virtual void SetImageList(wxImageList *imageList) wxOVERRIDE;
+    virtual int ChangeSelection(size_t n) override { return DoSetSelection(n); }
+    virtual void SetImageList(wxImageList *imageList) override;
 
-    virtual bool DeleteAllPages() wxOVERRIDE;
+    virtual bool DeleteAllPages() override;
 
     // returns the choice control
     wxChoice* GetChoiceCtrl() const { return (wxChoice*)m_bookctrl; }
 
 protected:
-    virtual void DoSetWindowVariant(wxWindowVariant variant) wxOVERRIDE;
+    virtual void DoSetWindowVariant(wxWindowVariant variant) override;
 
-    virtual wxWindow *DoRemovePage(size_t page) wxOVERRIDE;
+    virtual wxWindow *DoRemovePage(size_t page) override;
 
-    void UpdateSelectedPage(size_t newsel) wxOVERRIDE
+    void UpdateSelectedPage(size_t newsel) override
     {
         GetChoiceCtrl()->Select(static_cast<int>(newsel));
     }
 
-    wxBookCtrlEvent* CreatePageChangingEvent() const wxOVERRIDE;
-    void MakeChangedEvent(wxBookCtrlEvent &event) wxOVERRIDE;
+    wxBookCtrlEvent* CreatePageChangingEvent() const override;
+    void MakeChangedEvent(wxBookCtrlEvent &event) override;
 
     // 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 wxOVERRIDE
+    virtual wxEvent *Clone() const override
     {
         return new wxClipboardEvent(*this);
     }

include/wx/clrpicker.h

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

include/wx/collpane.h

@@ -41,13 +41,13 @@ public:
 
     virtual wxWindow *GetPane() const = 0;
 
-    virtual wxString GetLabel() const wxOVERRIDE = 0;
-    virtual void SetLabel(const wxString& label) wxOVERRIDE = 0;
+    virtual wxString GetLabel() const override = 0;
+    virtual void SetLabel(const wxString& label) override = 0;
 
     virtual bool
     InformFirstDirection(int direction,
                          int size,
-                         int availableOtherDir) wxOVERRIDE
+                         int availableOtherDir) override
     {
         wxWindow* const p = GetPane();
         if ( !p )
@@ -87,7 +87,7 @@ public:
 
 
     // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const wxOVERRIDE { return new wxCollapsiblePaneEvent(*this); }
+    virtual wxEvent *Clone() const override { return new wxCollapsiblePaneEvent(*this); }
 
 private:
     bool m_bCollapsed;

include/wx/colordlg.h

@@ -57,7 +57,7 @@ public:
     wxColour GetColour() const { return m_colour; }
     void SetColour(const wxColour& colour) { m_colour = colour; }
 
-    virtual wxEvent *Clone() const wxOVERRIDE
+    virtual wxEvent *Clone() const override
     {
         return new wxColourDialogEvent(*this);
     }

include/wx/colour.h

@@ -202,14 +202,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 wxOVERRIDE
+    virtual wxGDIRefData *CreateGDIRefData() const override
     {
         wxFAIL_MSG( "must be overridden if used" );
 
         return NULL;
     }
 
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const wxOVERRIDE
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const override
     {
         wxFAIL_MSG( "must be overridden if used" );
 

include/wx/combo.h

@@ -209,9 +209,9 @@ public:
     wxWindow *GetButton() const { return m_btn; }
 
     // forward these methods to all subcontrols
-    virtual bool Enable(bool enable = true) wxOVERRIDE;
-    virtual bool Show(bool show = true) wxOVERRIDE;
-    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
+    virtual bool Enable(bool enable = true) override;
+    virtual bool Show(bool show = true) override;
+    virtual bool SetFont(const wxFont& font) override;
 
     //
     // wxTextEntry methods
@@ -219,49 +219,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) wxOVERRIDE
+    virtual void SetValue(const wxString& value) override
         { wxTextEntryBase::SetValue(value); }
-    virtual void ChangeValue(const wxString& value) wxOVERRIDE
+    virtual void ChangeValue(const wxString& value) override
         { wxTextEntryBase::ChangeValue(value); }
 
-    virtual void WriteText(const wxString& text) wxOVERRIDE;
-    virtual void AppendText(const wxString& text) wxOVERRIDE
+    virtual void WriteText(const wxString& text) override;
+    virtual void AppendText(const wxString& text) override
         { wxTextEntryBase::AppendText(text); }
 
-    virtual wxString GetValue() const wxOVERRIDE
+    virtual wxString GetValue() const override
         { return wxTextEntryBase::GetValue(); }
 
-    virtual wxString GetRange(long from, long to) const wxOVERRIDE
+    virtual wxString GetRange(long from, long to) const override
         { 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) wxOVERRIDE;
+    virtual void Replace(long from, long to, const wxString& value) override;
 
-    virtual void Remove(long from, long to) wxOVERRIDE;
+    virtual void Remove(long from, long to) override;
 
-    virtual void Copy() wxOVERRIDE;
-    virtual void Cut() wxOVERRIDE;
-    virtual void Paste() wxOVERRIDE;
+    virtual void Copy() override;
+    virtual void Cut() override;
+    virtual void Paste() override;
 
-    virtual void Undo() wxOVERRIDE;
-    virtual void Redo() wxOVERRIDE;
-    virtual bool CanUndo() const wxOVERRIDE;
-    virtual bool CanRedo() const wxOVERRIDE;
+    virtual void Undo() override;
+    virtual void Redo() override;
+    virtual bool CanUndo() const override;
+    virtual bool CanRedo() const override;
 
-    virtual void SetInsertionPoint(long pos) wxOVERRIDE;
-    virtual long GetInsertionPoint() const wxOVERRIDE;
-    virtual long GetLastPosition() const wxOVERRIDE;
+    virtual void SetInsertionPoint(long pos) override;
+    virtual long GetInsertionPoint() const override;
+    virtual long GetLastPosition() const override;
 
-    virtual void SetSelection(long from, long to) wxOVERRIDE;
-    virtual void GetSelection(long *from, long *to) const wxOVERRIDE;
+    virtual void SetSelection(long from, long to) override;
+    virtual void GetSelection(long *from, long *to) const override;
 
-    virtual bool IsEditable() const wxOVERRIDE;
-    virtual void SetEditable(bool editable) wxOVERRIDE;
+    virtual bool IsEditable() const override;
+    virtual void SetEditable(bool editable) override;
 
-    virtual bool SetHint(const wxString& hint) wxOVERRIDE;
-    virtual wxString GetHint() const wxOVERRIDE;
+    virtual bool SetHint(const wxString& hint) override;
+    virtual wxString GetHint() const override;
 
     // This method sets the text without affecting list selection
     // (ie. wxComboPopup::SetStringValue doesn't get called).
@@ -459,12 +459,12 @@ public:
     void SetCtrlMainWnd( wxWindow* wnd ) { m_mainCtrlWnd = wnd; }
 
     // This is public so we can access it from wxComboCtrlTextCtrl
-    virtual wxWindow *GetMainWindowOfCompositeControl() wxOVERRIDE
+    virtual wxWindow *GetMainWindowOfCompositeControl() override
         { return m_mainCtrlWnd; }
 
     // also set the embedded wxTextCtrl colours
-    virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE;
-    virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE;
+    virtual bool SetForegroundColour(const wxColour& colour) override;
+    virtual bool SetBackgroundColour(const wxColour& colour) override;
 
 protected:
 
@@ -535,8 +535,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 wxOVERRIDE;
-    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const override;
+    virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const override;
 
     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);
@@ -600,17 +600,17 @@ protected:
     virtual bool AnimateShow( const wxRect& rect, int flags );
 
 #if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip ) wxOVERRIDE;
+    virtual void DoSetToolTip( wxToolTip *tip ) override;
 #endif
 
     // protected wxTextEntry methods
-    virtual void DoSetValue(const wxString& value, int flags) wxOVERRIDE;
-    virtual wxString DoGetValue() const wxOVERRIDE;
-    virtual wxWindow *GetEditableWindow() wxOVERRIDE { return this; }
+    virtual void DoSetValue(const wxString& value, int flags) override;
+    virtual wxString DoGetValue() const override;
+    virtual wxWindow *GetEditableWindow() override { return this; }
 
     // margins functions
-    virtual bool DoSetMargins(const wxPoint& pt) wxOVERRIDE;
-    virtual wxPoint DoGetMargins() const wxOVERRIDE;
+    virtual bool DoSetMargins(const wxPoint& pt) override;
+    virtual wxPoint DoGetMargins() const override;
 
     // 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() wxOVERRIDE
+    virtual void Clear() override
     {
         wxItemContainer::Clear();
         wxTextEntry::Clear();
@@ -53,8 +53,8 @@ public:
     //     but still make it pure virtual because for some platforms it's not
     //     implemented there and also because the derived class has to override
     //     it anyhow to avoid ambiguity with the other GetSelection()
-    virtual int GetSelection() const wxOVERRIDE = 0;
-    virtual void GetSelection(long *from, long *to) const wxOVERRIDE = 0;
+    virtual int GetSelection() const override = 0;
+    virtual void GetSelection(long *from, long *to) const override = 0;
 
     virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
     virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }

include/wx/commandlinkbutton.h

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

include/wx/compositewin.h

@@ -48,7 +48,7 @@ public:
     //     it non-virtually and we need to do this to avoid infinite recursion,
     //     so we work around this by calling the method of this object itself
     //     manually in each function.
-    virtual bool SetForegroundColour(const wxColour& colour) wxOVERRIDE
+    virtual bool SetForegroundColour(const wxColour& colour) override
     {
         if ( !BaseWindowClass::SetForegroundColour(colour) )
             return false;
@@ -58,7 +58,7 @@ public:
         return true;
     }
 
-    virtual bool SetBackgroundColour(const wxColour& colour) wxOVERRIDE
+    virtual bool SetBackgroundColour(const wxColour& colour) override
     {
         if ( !BaseWindowClass::SetBackgroundColour(colour) )
             return false;
@@ -68,7 +68,7 @@ public:
         return true;
     }
 
-    virtual bool SetFont(const wxFont& font) wxOVERRIDE
+    virtual bool SetFont(const wxFont& font) override
     {
         if ( !BaseWindowClass::SetFont(font) )
             return false;
@@ -78,7 +78,7 @@ public:
         return true;
     }
 
-    virtual bool SetCursor(const wxCursor& cursor) wxOVERRIDE
+    virtual bool SetCursor(const wxCursor& cursor) override
     {
         if ( !BaseWindowClass::SetCursor(cursor) )
             return false;
@@ -88,7 +88,7 @@ public:
         return true;
     }
 
-    virtual void SetLayoutDirection(wxLayoutDirection dir) wxOVERRIDE
+    virtual void SetLayoutDirection(wxLayoutDirection dir) override
     {
         BaseWindowClass::SetLayoutDirection(dir);
 
@@ -107,7 +107,7 @@ public:
     }
 
 #if wxUSE_TOOLTIPS
-    virtual void DoSetToolTipText(const wxString &tip) wxOVERRIDE
+    virtual void DoSetToolTipText(const wxString &tip) override
     {
         BaseWindowClass::DoSetToolTipText(tip);
 
@@ -117,7 +117,7 @@ public:
         SetForAllParts(func, tip);
     }
 
-    virtual void DoSetToolTip(wxToolTip *tip) wxOVERRIDE
+    virtual void DoSetToolTip(wxToolTip *tip) override
     {
         BaseWindowClass::DoSetToolTip(tip);
 
@@ -163,7 +163,7 @@ template <class W>
 class wxCompositeWindow : public wxCompositeWindowSettersOnly<W>
 {
 public:
-    virtual void SetFocus() wxOVERRIDE
+    virtual void SetFocus() override
     {
         wxSetFocusToChild(this, NULL);
     }

include/wx/containr.h

@@ -144,7 +144,7 @@ class WXDLLIMPEXP_CORE wxControlContainer : public wxControlContainerBase
 {
 protected:
     // set the focus to the child which had it the last time
-    virtual bool SetFocusToChild() wxOVERRIDE;
+    virtual bool SetFocusToChild() override;
 };
 
 #else // !wxHAS_NATIVE_TAB_TRAVERSAL
@@ -206,22 +206,22 @@ public:
 #endif // !wxHAS_NATIVE_TAB_TRAVERSAL
     }
 
-    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocus() const override
     {
         return m_container.AcceptsFocus();
     }
 
-    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusRecursively() const override
     {
         return m_container.AcceptsFocusRecursively();
     }
 
-    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual bool AcceptsFocusFromKeyboard() const override
     {
         return m_container.AcceptsFocusFromKeyboard();
     }
 
-    WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual void AddChild(wxWindowBase *child) override
     {
         BaseWindowClass::AddChild(child);
 
@@ -234,7 +234,7 @@ public:
         }
     }
 
-    WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual void RemoveChild(wxWindowBase *child) override
     {
 #ifndef wxHAS_NATIVE_TAB_TRAVERSAL
         m_container.HandleOnWindowDestroy(child);
@@ -247,7 +247,7 @@ public:
         m_container.UpdateCanFocusChildren();
     }
 
-    WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual void SetFocus() override
     {
         if ( !m_container.DoSetFocus() )
             BaseWindowClass::SetFocus();
@@ -259,13 +259,13 @@ public:
     }
 
 #ifdef __WXMSW__
-    WXDLLIMPEXP_INLINE_CORE virtual bool HasTransparentBackground() wxOVERRIDE
+    WXDLLIMPEXP_INLINE_CORE virtual bool HasTransparentBackground() override
     {
         return m_container.HasTransparentBackground();
     }
 
     WXDLLIMPEXP_INLINE_CORE
-    virtual void WXSetPendingFocus(wxWindow* win) wxOVERRIDE
+    virtual void WXSetPendingFocus(wxWindow* win) override
     {
         return m_container.SetLastFocus(win);
     }

include/wx/control.h

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

include/wx/convauto.h

@@ -71,16 +71,16 @@ 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 wxOVERRIDE;
+                           const char *src, size_t srcLen = wxNO_LEN) const override;
 
     virtual size_t FromWChar(char *dst, size_t dstLen,
-                             const wchar_t *src, size_t srcLen = wxNO_LEN) const wxOVERRIDE;
+                             const wchar_t *src, size_t srcLen = wxNO_LEN) const override;
 
-    virtual size_t GetMBNulLen() const wxOVERRIDE { return m_conv->GetMBNulLen(); }
+    virtual size_t GetMBNulLen() const override { return m_conv->GetMBNulLen(); }
 
-    virtual bool IsUTF8() const wxOVERRIDE { return m_conv && m_conv->IsUTF8(); }
+    virtual bool IsUTF8() const override { return m_conv && m_conv->IsUTF8(); }
 
-    virtual wxMBConv *Clone() const wxOVERRIDE { return new wxConvAuto(*this); }
+    virtual wxMBConv *Clone() const override { 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) wxOVERRIDE;
+    virtual wxString GetHelp(const wxWindowBase *window) override;
 
     // override ShowHelp() and not ShowHelpAtPoint() as explained above
-    virtual bool ShowHelp(wxWindowBase *window) wxOVERRIDE;
+    virtual bool ShowHelp(wxWindowBase *window) override;
 
-    virtual void AddHelp(wxWindowBase *window, const wxString& text) wxOVERRIDE;
-    virtual void AddHelp(wxWindowID id, const wxString& text) wxOVERRIDE;
-    virtual void RemoveHelp(wxWindowBase* window) wxOVERRIDE;
+    virtual void AddHelp(wxWindowBase *window, const wxString& text) override;
+    virtual void AddHelp(wxWindowID id, const wxString& text) override;
+    virtual void RemoveHelp(wxWindowBase* window) override;
 
 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) wxOVERRIDE;
+    virtual bool ShowHelp(wxWindowBase *window) override;
 
     // Other accessors
     void SetHelpController(wxHelpControllerBase* hc) { m_helpController = hc; }

include/wx/ctrlsub.h

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

include/wx/dataobj.h

@@ -223,20 +223,20 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE
+    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override
         { return m_format; }
-    virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE
+    virtual size_t GetFormatCount(wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override
         { return 1; }
     virtual void GetAllFormats(wxDataFormat *formats,
-                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override
         { *formats = m_format; }
-    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const wxOVERRIDE
+    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const override
         { return GetDataSize(); }
     virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
-                             void *buf) const wxOVERRIDE
+                             void *buf) const override
         { return GetDataHere(buf); }
     virtual bool SetData(const wxDataFormat& WXUNUSED(format),
-                         size_t len, const void *buf) wxOVERRIDE
+                         size_t len, const void *buf) override
         { return SetData(len, buf); }
 
 private:
@@ -284,18 +284,18 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE;
-    virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const wxOVERRIDE;
-    virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const wxOVERRIDE;
-    virtual size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE;
-    virtual bool GetDataHere(const wxDataFormat& format, void *buf) const wxOVERRIDE;
-    virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) wxOVERRIDE;
+    virtual wxDataFormat GetPreferredFormat(wxDataObjectBase::Direction dir = Get) const override;
+    virtual size_t GetFormatCount(wxDataObjectBase::Direction dir = Get) const override;
+    virtual void GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir = Get) const override;
+    virtual size_t GetDataSize(const wxDataFormat& format) const override;
+    virtual bool GetDataHere(const wxDataFormat& format, void *buf) const override;
+    virtual bool SetData(const wxDataFormat& format, size_t len, const void *buf) override;
 #if defined(__WXMSW__)
     virtual const void* GetSizeFromBuffer( const void* buffer, size_t* size,
-                                           const wxDataFormat& format ) wxOVERRIDE;
+                                           const wxDataFormat& format ) override;
     virtual void* SetSizeInBuffer( void* buffer, size_t size,
-                                   const wxDataFormat& format ) wxOVERRIDE;
-    virtual size_t GetBufferOffset( const wxDataFormat& format ) wxOVERRIDE;
+                                   const wxDataFormat& format ) override;
+    virtual size_t GetBufferOffset( const wxDataFormat& format ) override;
 #endif
 
 private:
@@ -348,20 +348,20 @@ public:
     virtual wxString GetHTML() const { return m_html; }
     virtual void SetHTML(const wxString& html) { m_html = html; }
 
-    virtual size_t GetDataSize() const wxOVERRIDE;
-    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
-    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
+    virtual size_t GetDataSize() const override;
+    virtual bool GetDataHere(void *buf) const override;
+    virtual bool SetData(size_t len, const void *buf) override;
 
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
+    virtual size_t GetDataSize(const wxDataFormat&) const override
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const override
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override
     {
         return SetData(len, buf);
     }
@@ -398,31 +398,31 @@ 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 wxOVERRIDE { return 2; }
+    virtual size_t GetFormatCount(Direction WXUNUSED(dir) = Get) const override { return 2; }
     virtual void GetAllFormats(wxDataFormat *formats,
-                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const wxOVERRIDE;
+                               wxDataObjectBase::Direction WXUNUSED(dir) = Get) const override;
 
-    virtual size_t GetDataSize() const wxOVERRIDE { return GetDataSize(GetPreferredFormat()); }
-    virtual bool GetDataHere(void *buf) const wxOVERRIDE { return GetDataHere(GetPreferredFormat(), buf); }
-    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE { return SetData(GetPreferredFormat(), len, buf); }
+    virtual size_t GetDataSize() const override { return GetDataSize(GetPreferredFormat()); }
+    virtual bool GetDataHere(void *buf) const override { return GetDataHere(GetPreferredFormat(), buf); }
+    virtual bool SetData(size_t len, const void *buf) override { return SetData(GetPreferredFormat(), len, buf); }
 
-    size_t GetDataSize(const wxDataFormat& format) const wxOVERRIDE;
-    bool GetDataHere(const wxDataFormat& format, void *pBuf) const wxOVERRIDE;
-    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) wxOVERRIDE;
+    size_t GetDataSize(const wxDataFormat& format) const override;
+    bool GetDataHere(const wxDataFormat& format, void *pBuf) const override;
+    bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) override;
 #else // !wxNEEDS_UTF{8,16}_FOR_TEXT_DATAOBJ
-    virtual size_t GetDataSize() const wxOVERRIDE;
-    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
-    virtual bool SetData(size_t len, const void *buf) wxOVERRIDE;
+    virtual size_t GetDataSize() const override;
+    virtual bool GetDataHere(void *buf) const override;
+    virtual bool SetData(size_t len, const void *buf) override;
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
+    virtual size_t GetDataSize(const wxDataFormat&) const override
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const override
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override
     {
         return SetData(len, buf);
     }
@@ -431,7 +431,7 @@ public:
 private:
 #if defined(__WXQT__)
     // Overridden to set text directly instead of extracting byte array
-    void QtSetDataSingleFormat(const class QMimeData &mimeData, const wxDataFormat &format) wxOVERRIDE;
+    void QtSetDataSingleFormat(const class QMimeData &mimeData, const wxDataFormat &format) override;
 #endif
 
     wxString m_text;
@@ -523,19 +523,19 @@ public:
 
     // implement base class pure virtuals
     // ----------------------------------
-    virtual size_t GetDataSize() const wxOVERRIDE;
-    virtual bool GetDataHere(void *buf) const wxOVERRIDE;
-    virtual bool SetData(size_t size, const void *buf) wxOVERRIDE;
+    virtual size_t GetDataSize() const override;
+    virtual bool GetDataHere(void *buf) const override;
+    virtual bool SetData(size_t size, const void *buf) override;
     // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const wxOVERRIDE
+    virtual size_t GetDataSize(const wxDataFormat&) const override
     {
         return GetDataSize();
     }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const wxOVERRIDE
+    virtual bool GetDataHere(const wxDataFormat&, void *buf) const override
     {
         return GetDataHere(buf);
     }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) wxOVERRIDE
+    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) override
     {
         return SetData(len, buf);
     }

include/wx/dataview.h

@@ -346,13 +346,13 @@ public:
 
     // implement some base class pure virtual directly
     virtual wxDataViewItem
-    GetParent( const wxDataViewItem & WXUNUSED(item) ) const wxOVERRIDE
+    GetParent( const wxDataViewItem & WXUNUSED(item) ) const override
     {
         // items never have valid parent in this model
         return wxDataViewItem();
     }
 
-    virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE
+    virtual bool IsContainer( const wxDataViewItem &item ) const override
     {
         // only the invisible (and invalid) root item has children
         return !item.IsOk();
@@ -360,30 +360,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 wxOVERRIDE
+                           const wxDataViewItem &item, unsigned int col ) const override
     {
         GetValueByRow(variant, GetRow(item), col);
     }
 
     virtual bool SetValue( const wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col ) wxOVERRIDE
+                           const wxDataViewItem &item, unsigned int col ) override
     {
         return SetValueByRow( variant, GetRow(item), col );
     }
 
     virtual bool GetAttr(const wxDataViewItem &item, unsigned int col,
-                         wxDataViewItemAttr &attr) const wxOVERRIDE
+                         wxDataViewItemAttr &attr) const override
     {
         return GetAttrByRow( GetRow(item), col, attr );
     }
 
-    virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const wxOVERRIDE
+    virtual bool IsEnabled(const wxDataViewItem &item, unsigned int col) const override
     {
         return IsEnabledByRow( GetRow(item), col );
     }
 
 
-    virtual bool IsListModel() const wxOVERRIDE { return true; }
+    virtual bool IsListModel() const override { return true; }
 };
 
 // ---------------------------------------------------------
@@ -406,13 +406,13 @@ public:
 
     // convert to/from row/wxDataViewItem
 
-    virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE;
+    virtual unsigned GetRow( const wxDataViewItem &item ) const override;
     wxDataViewItem GetItem( unsigned int row ) const;
 
     // implement base methods
-    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const override;
 
-    unsigned int GetCount() const wxOVERRIDE { return (unsigned int)m_hash.GetCount(); }
+    unsigned int GetCount() const override { return (unsigned int)m_hash.GetCount(); }
 
 private:
     wxDataViewItemArray m_hash;
@@ -445,22 +445,22 @@ public:
 
     // convert to/from row/wxDataViewItem
 
-    virtual unsigned GetRow( const wxDataViewItem &item ) const wxOVERRIDE;
+    virtual unsigned GetRow( const wxDataViewItem &item ) const override;
     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 wxOVERRIDE;
-    virtual bool HasDefaultCompare() const wxOVERRIDE;
+                         unsigned int column, bool ascending ) const override;
+    virtual bool HasDefaultCompare() const override;
 
     // implement base methods
-    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const override;
 
-    unsigned int GetCount() const wxOVERRIDE { return m_size; }
+    unsigned int GetCount() const override { return m_size; }
 
     // internal
-    virtual bool IsVirtualListModel() const wxOVERRIDE { return true; }
+    virtual bool IsVirtualListModel() const override { return true; }
 
 private:
     unsigned int m_size;
@@ -518,9 +518,9 @@ 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 wxBitmapBundle& bitmap ) wxOVERRIDE { m_bitmap = bitmap; }
-    virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap.GetBitmap(wxDefaultSize); }
-    virtual wxBitmapBundle GetBitmapBundle() const wxOVERRIDE { return m_bitmap; }
+    virtual void SetBitmap( const wxBitmapBundle& bitmap ) override { m_bitmap = bitmap; }
+    virtual wxBitmap GetBitmap() const override { return m_bitmap.GetBitmap(wxDefaultSize); }
+    virtual wxBitmapBundle GetBitmapBundle() const override { return m_bitmap; }
 
     // Special accessor for use by wxWidgets only returning the width that was
     // explicitly set, either by the application, using SetWidth(), or by the
@@ -798,7 +798,7 @@ public:
     virtual bool SetAlternateRowColour(const wxColour& WXUNUSED(colour))
         { return false; }
 
-    virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
+    virtual wxVisualAttributes GetDefaultAttributes() const override
     {
         return GetClassDefaultAttributes(GetWindowVariant());
     }
@@ -949,7 +949,7 @@ public:
     void InitData(wxDataObjectComposite* obj, wxDataFormat format);
 #endif // wxUSE_DRAG_AND_DROP
 
-    virtual wxEvent *Clone() const wxOVERRIDE { return new wxDataViewEvent(*this); }
+    virtual wxEvent *Clone() const override { return new wxDataViewEvent(*this); }
 
     // These methods shouldn't be used outside of wxWidgets and wxWidgets
     // itself doesn't use them any longer either as it constructs the events
@@ -1120,10 +1120,10 @@ public:
     // override base virtuals
 
     virtual void GetValueByRow( wxVariant &value,
-                           unsigned int row, unsigned int col ) const wxOVERRIDE;
+                           unsigned int row, unsigned int col ) const override;
 
     virtual bool SetValueByRow( const wxVariant &value,
-                           unsigned int row, unsigned int col ) wxOVERRIDE;
+                           unsigned int row, unsigned int col ) override;
 
 
 public:
@@ -1172,10 +1172,10 @@ public:
     bool InsertColumn( unsigned int pos, wxDataViewColumn *column, const wxString &varianttype );
 
     // overridden from base class
-    virtual bool PrependColumn( wxDataViewColumn *col ) wxOVERRIDE;
-    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) wxOVERRIDE;
-    virtual bool AppendColumn( wxDataViewColumn *col ) wxOVERRIDE;
-    virtual bool ClearColumns() wxOVERRIDE;
+    virtual bool PrependColumn( wxDataViewColumn *col ) override;
+    virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ) override;
+    virtual bool AppendColumn( wxDataViewColumn *col ) override;
+    virtual bool ClearColumns() override;
 
     wxDataViewColumn *AppendTextColumn( const wxString &label,
           wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
@@ -1306,7 +1306,7 @@ public:
     bool IsExpanded() const
         { return m_isExpanded; }
 
-    virtual bool IsContainer() wxOVERRIDE
+    virtual bool IsContainer() override
         { return true; }
 
     void DestroyChildren();
@@ -1375,17 +1375,17 @@ public:
     // implement base methods
 
     virtual void GetValue( wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col ) const wxOVERRIDE;
+                           const wxDataViewItem &item, unsigned int col ) const override;
     virtual bool SetValue( const wxVariant &variant,
-                           const wxDataViewItem &item, unsigned int col ) wxOVERRIDE;
-    virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const wxOVERRIDE;
-    virtual bool IsContainer( const wxDataViewItem &item ) const wxOVERRIDE;
-    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const wxOVERRIDE;
+                           const wxDataViewItem &item, unsigned int col ) override;
+    virtual wxDataViewItem GetParent( const wxDataViewItem &item ) const override;
+    virtual bool IsContainer( const wxDataViewItem &item ) const override;
+    virtual unsigned int GetChildren( const wxDataViewItem &item, wxDataViewItemArray &children ) const override;
 
     virtual int Compare( const wxDataViewItem &item1, const wxDataViewItem &item2,
-                         unsigned int column, bool ascending ) const wxOVERRIDE;
+                         unsigned int column, bool ascending ) const override;
 
-    virtual bool HasDefaultCompare() const wxOVERRIDE
+    virtual bool HasDefaultCompare() const override
         { return true; }
 
     wxDataViewTreeStoreNode *FindNode( const wxDataViewItem &item ) const;
@@ -1475,7 +1475,7 @@ public:
     void OnSize( wxSizeEvent &event );
 
 protected:
-    virtual void OnImagesChanged() wxOVERRIDE;
+    virtual void OnImagesChanged() override;
 
 private:
     wxDECLARE_EVENT_TABLE();

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 wxOVERRIDE { return new wxDateEvent(*this); }
+    virtual wxEvent *Clone() const override { return new wxDateEvent(*this); }
 
 private:
     wxDateTime m_date;

include/wx/datetime.h

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

include/wx/dc.h

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

include/wx/dcprint.h

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

include/wx/debugrpt.h

@@ -152,10 +152,10 @@ public:
     const wxString& GetCompressedFileName() const { return m_zipfile; }
 
 protected:
-    virtual bool DoProcess() wxOVERRIDE;
+    virtual bool DoProcess() override;
 
     // return the location where the report will be saved
-    wxFileName GetSaveLocation() const wxOVERRIDE;
+    wxFileName GetSaveLocation() const override;
 
 private:
     // user-specified file directory/base name, use defaults if empty
@@ -185,7 +185,7 @@ public:
                         const wxString& curl = wxT("curl"));
 
 protected:
-    virtual bool DoProcess() wxOVERRIDE;
+    virtual bool DoProcess() override;
 
     // 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
@@ -246,7 +246,7 @@ class WXDLLIMPEXP_QA wxDebugReportPreviewStd : public wxDebugReportPreview
 public:
     wxDebugReportPreviewStd() { }
 
-    virtual bool Show(wxDebugReport& dbgrpt) const wxOVERRIDE;
+    virtual bool Show(wxDebugReport& dbgrpt) const override;
 };
 
 #endif // wxUSE_GUI

include/wx/dfb/private/overlay.h

@@ -25,12 +25,12 @@ public:
     wxOverlayImpl();
     ~wxOverlayImpl();
 
-    virtual void Reset() wxOVERRIDE;
-    virtual bool IsOk() wxOVERRIDE;
-    virtual void Init(wxDC* dc, int x, int y, int width, int height) wxOVERRIDE;
-    virtual void BeginDrawing(wxDC* dc) wxOVERRIDE;
-    virtual void EndDrawing(wxDC* dc) wxOVERRIDE;
-    virtual void Clear(wxDC* dc) wxOVERRIDE;
+    virtual void Reset() override;
+    virtual bool IsOk() override;
+    virtual void Init(wxDC* dc, int x, int y, int width, int height) override;
+    virtual void BeginDrawing(wxDC* dc) override;
+    virtual void EndDrawing(wxDC* dc) override;
+    virtual void Clear(wxDC* dc) override;
 
     // wxDFB specific methods:
     bool IsEmpty() const { return m_isEmpty; }

include/wx/dialog.h

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

include/wx/dialup.h

@@ -176,7 +176,7 @@ public:
     bool IsOwnEvent() const { return m_id != 0; }
 
     // implement the base class pure virtual
-    virtual wxEvent *Clone() const wxOVERRIDE { return new wxDialUpEvent(*this); }
+    virtual wxEvent *Clone() const override { return new wxDialUpEvent(*this); }
 
 private:
     wxDECLARE_NO_ASSIGN_DEF_COPY(wxDialUpEvent);

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) wxOVERRIDE;
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override;
 
 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) wxOVERRIDE;
+    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) override;
 
 private:
     wxDECLARE_NO_COPY_CLASS(wxFileDropTarget);

include/wx/docview.h

@@ -285,7 +285,7 @@ public:
 
 protected:
     // hook the document into event handlers chain here
-    virtual bool TryBefore(wxEvent& event) wxOVERRIDE;
+    virtual bool TryBefore(wxEvent& event) override;
 
     wxDocument*       m_viewDocument;
     wxString          m_viewTypeName;
@@ -540,7 +540,7 @@ protected:
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
     // hook the currently active view into event handlers chain here
-    virtual bool TryBefore(wxEvent& event) wxOVERRIDE;
+    virtual bool TryBefore(wxEvent& event) override;
 
     // return the command processor for the current document, if any
     wxCommandProcessor *GetCurrentCommandProcessor() const;
@@ -716,7 +716,7 @@ public:
 
 protected:
     // hook the child view into event handlers chain here
-    virtual bool TryBefore(wxEvent& event) wxOVERRIDE
+    virtual bool TryBefore(wxEvent& event) override
     {
         return TryProcessEvent(event) || BaseClass::TryBefore(event);
     }
@@ -869,7 +869,7 @@ public:
 
 protected:
     // hook the document manager into event handling chain here
-    virtual bool TryBefore(wxEvent& event) wxOVERRIDE
+    virtual bool TryBefore(wxEvent& event) override
     {
         // It is important to send the event to the base class first as
         // wxMDIParentFrame overrides its TryBefore() to send the menu events
@@ -952,11 +952,11 @@ public:
     wxDocPrintout(wxView *view = NULL, const wxString& title = wxString());
 
     // implement wxPrintout methods
-    virtual bool OnPrintPage(int page) wxOVERRIDE;
-    virtual bool HasPage(int page) wxOVERRIDE;
-    virtual bool OnBeginDocument(int startPage, int endPage) wxOVERRIDE;
+    virtual bool OnPrintPage(int page) override;
+    virtual bool HasPage(int page) override;
+    virtual bool OnBeginDocument(int startPage, int endPage) override;
     virtual void GetPageInfo(int *minPage, int *maxPage,
-                             int *selPageFrom, int *selPageTo) wxOVERRIDE;
+                             int *selPageFrom, int *selPageTo) override;
 
     virtual wxView *GetView() { return m_printoutView; }
 

include/wx/dvrenderers.h

@@ -376,12 +376,12 @@ public:
 
     // Override the base class virtual method to simply store the attribute so
     // that it can be accessed using GetAttr() from Render() if needed.
-    virtual void SetAttr(const wxDataViewItemAttr& attr) wxOVERRIDE { m_attr = attr; }
+    virtual void SetAttr(const wxDataViewItemAttr& attr) override { m_attr = attr; }
     const wxDataViewItemAttr& GetAttr() const { return m_attr; }
 
     // Store the enabled state of the item so that it can be accessed from
     // Render() via GetEnabled() if needed.
-    virtual void SetEnabled(bool enabled) wxOVERRIDE;
+    virtual void SetEnabled(bool enabled) override;
     bool GetEnabled() const { return m_enabled; }
 
 
@@ -397,7 +397,7 @@ public:
     // Prepare DC to use attributes and call Render().
     void WXCallRender(wxRect rect, wxDC *dc, int state);
 
-    virtual bool IsCustomRenderer() const wxOVERRIDE { return true; }
+    virtual bool IsCustomRenderer() const override { return true; }
 
 protected:
     // helper for GetSize() implementations, respects attributes
@@ -441,15 +441,15 @@ public:
     wxDataViewSpinRenderer( int min, int max,
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
-    virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
-    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE;
-    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
-    virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE;
-    virtual wxSize GetSize() const wxOVERRIDE;
-    virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
-    virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
+    virtual bool HasEditorCtrl() const override { return true; }
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) override;
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override;
+    virtual bool Render( wxRect rect, wxDC *dc, int state ) override;
+    virtual wxSize GetSize() const override;
+    virtual bool SetValue( const wxVariant &value ) override;
+    virtual bool GetValue( wxVariant &value ) const override;
 #if wxUSE_ACCESSIBILITY
-    virtual wxString GetAccessibleDescription() const wxOVERRIDE;
+    virtual wxString GetAccessibleDescription() const override;
 #endif // wxUSE_ACCESSIBILITY
 
 private:
@@ -471,15 +471,15 @@ public:
     wxDataViewChoiceRenderer( const wxArrayString &choices,
                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
-    virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
-    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE;
-    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
-    virtual bool Render( wxRect rect, wxDC *dc, int state ) wxOVERRIDE;
-    virtual wxSize GetSize() const wxOVERRIDE;
-    virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
-    virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
+    virtual bool HasEditorCtrl() const override { return true; }
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) override;
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override;
+    virtual bool Render( wxRect rect, wxDC *dc, int state ) override;
+    virtual wxSize GetSize() const override;
+    virtual bool SetValue( const wxVariant &value ) override;
+    virtual bool GetValue( wxVariant &value ) const override;
 #if wxUSE_ACCESSIBILITY
-    virtual wxString GetAccessibleDescription() const wxOVERRIDE;
+    virtual wxString GetAccessibleDescription() const override;
 #endif // wxUSE_ACCESSIBILITY
 
     wxString GetChoice(size_t index) const { return m_choices[index]; }
@@ -501,13 +501,13 @@ public:
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                               int alignment = wxDVR_DEFAULT_ALIGNMENT );
 
-    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) wxOVERRIDE;
-    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) wxOVERRIDE;
+    virtual wxWindow* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ) override;
+    virtual bool GetValueFromEditorCtrl( wxWindow* editor, wxVariant &value ) override;
 
-    virtual bool SetValue( const wxVariant &value ) wxOVERRIDE;
-    virtual bool GetValue( wxVariant &value ) const wxOVERRIDE;
+    virtual bool SetValue( const wxVariant &value ) override;
+    virtual bool GetValue( wxVariant &value ) const override;
 #if wxUSE_ACCESSIBILITY
-    virtual wxString GetAccessibleDescription() const wxOVERRIDE;
+    virtual wxString GetAccessibleDescription() const override;
 #endif // wxUSE_ACCESSIBILITY
 };
 
@@ -530,16 +530,16 @@ public:
                            wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
                            int align = wxDVR_DEFAULT_ALIGNMENT);
 
-    virtual bool HasEditorCtrl() const wxOVERRIDE { return true; }
-    virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value) wxOVERRIDE;
-    virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value) wxOVERRIDE;
-    virtual bool SetValue(const wxVariant &value) wxOVERRIDE;
-    virtual bool GetValue(wxVariant& value) const wxOVERRIDE;
+    virtual bool HasEditorCtrl() const override { return true; }
+    virtual wxWindow *CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant &value) override;
+    virtual bool GetValueFromEditorCtrl(wxWindow* editor, wxVariant &value) override;
+    virtual bool SetValue(const wxVariant &value) override;
+    virtual bool GetValue(wxVariant& value) const override;
 #if wxUSE_ACCESSIBILITY
-    virtual wxString GetAccessibleDescription() const wxOVERRIDE;
+    virtual wxString GetAccessibleDescription() const override;
 #endif // wxUSE_ACCESSIBILITY
-    virtual bool Render( wxRect cell, wxDC *dc, int state ) wxOVERRIDE;
-    virtual wxSize GetSize() const wxOVERRIDE;
+    virtual bool Render( wxRect cell, wxDC *dc, int state ) override;
+    virtual wxSize GetSize() const override;
 
 private:
     wxString FormatDate() const;
@@ -576,20 +576,20 @@ public:
     // this to happen.
     void Allow3rdStateForUser(bool allow = true);
 
-    virtual bool SetValue(const wxVariant& value) wxOVERRIDE;
-    virtual bool GetValue(wxVariant& value) const wxOVERRIDE;
+    virtual bool SetValue(const wxVariant& value) override;
+    virtual bool GetValue(wxVariant& value) const override;
 
 #if wxUSE_ACCESSIBILITY
-    virtual wxString GetAccessibleDescription() const wxOVERRIDE;
+    virtual wxString GetAccessibleDescription() const override;
 #endif // wxUSE_ACCESSIBILITY
 
-    virtual wxSize GetSize() const wxOVERRIDE;
-    virtual bool Render(wxRect cell, wxDC* dc, int state) wxOVERRIDE;
+    virtual wxSize GetSize() const override;
+    virtual bool Render(wxRect cell, wxDC* dc, int state) override;
     virtual bool ActivateCell(const wxRect& cell,
                               wxDataViewModel *model,
                               const wxDataViewItem & item,
                               unsigned int col,
-                              const wxMouseEvent *mouseEvent) wxOVERRIDE;
+                              const wxMouseEvent *mouseEvent) override;
 
 private:
     wxSize GetCheckSize() const;

include/wx/dynarray.h

@@ -252,7 +252,7 @@ public:
     }
 
 protected:
-    SCMPFUNC GetCompareFunction() const wxNOEXCEPT { return m_fnCompare; }
+    SCMPFUNC GetCompareFunction() const noexcept { return m_fnCompare; }
 
 private:
     SCMPFUNC m_fnCompare;

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) wxOVERRIDE;
+    virtual void ScheduleExit(int rc = 0) override;
 
 protected:
     // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
     // terminating when Exit() is called
-    virtual int DoRun() wxOVERRIDE;
+    virtual int DoRun() override;
 
     // 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() wxOVERRIDE
+    virtual void OnExit() override
     {
         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 wxOVERRIDE { return new wxFindDialogEvent(*this); }
+    virtual wxEvent *Clone() const override { 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) wxOVERRIDE;
-  virtual const wxString& GetPath() const wxOVERRIDE;
+  virtual void SetPath(const wxString& strPath) override;
+  virtual const wxString& GetPath() const override;
 
-  virtual bool GetFirstGroup(wxString& str, long& lIndex) const wxOVERRIDE;
-  virtual bool GetNextGroup (wxString& str, long& lIndex) const wxOVERRIDE;
-  virtual bool GetFirstEntry(wxString& str, long& lIndex) const wxOVERRIDE;
-  virtual bool GetNextEntry (wxString& str, long& lIndex) const wxOVERRIDE;
+  virtual bool GetFirstGroup(wxString& str, long& lIndex) const override;
+  virtual bool GetNextGroup (wxString& str, long& lIndex) const override;
+  virtual bool GetFirstEntry(wxString& str, long& lIndex) const override;
+  virtual bool GetNextEntry (wxString& str, long& lIndex) const override;
 
-  virtual size_t GetNumberOfEntries(bool bRecursive = false) const wxOVERRIDE;
-  virtual size_t GetNumberOfGroups(bool bRecursive = false) const wxOVERRIDE;
+  virtual size_t GetNumberOfEntries(bool bRecursive = false) const override;
+  virtual size_t GetNumberOfGroups(bool bRecursive = false) const override;
 
-  virtual bool HasGroup(const wxString& strName) const wxOVERRIDE;
-  virtual bool HasEntry(const wxString& strName) const wxOVERRIDE;
+  virtual bool HasGroup(const wxString& strName) const override;
+  virtual bool HasEntry(const wxString& strName) const override;
 
-  virtual bool Flush(bool bCurrentOnly = false) wxOVERRIDE;
+  virtual bool Flush(bool bCurrentOnly = false) override;
 
-  virtual bool RenameEntry(const wxString& oldName, const wxString& newName) wxOVERRIDE;
-  virtual bool RenameGroup(const wxString& oldName, const wxString& newName) wxOVERRIDE;
+  virtual bool RenameEntry(const wxString& oldName, const wxString& newName) override;
+  virtual bool RenameGroup(const wxString& oldName, const wxString& newName) override;
 
-  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) wxOVERRIDE;
-  virtual bool DeleteGroup(const wxString& szKey) wxOVERRIDE;
-  virtual bool DeleteAll() wxOVERRIDE;
+  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true) override;
+  virtual bool DeleteGroup(const wxString& szKey) override;
+  virtual bool DeleteAll() override;
 
   // additional, wxFileConfig-specific, functionality
 #if wxUSE_STREAMS
@@ -194,16 +194,16 @@ public:
   bool      LineListIsEmpty();
 
 protected:
-  virtual bool DoReadString(const wxString& key, wxString *pStr) const wxOVERRIDE;
-  virtual bool DoReadLong(const wxString& key, long *pl) const wxOVERRIDE;
+  virtual bool DoReadString(const wxString& key, wxString *pStr) const override;
+  virtual bool DoReadLong(const wxString& key, long *pl) const override;
 #if wxUSE_BASE64
-  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const wxOVERRIDE;
+  virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const override;
 #endif // wxUSE_BASE64
 
-  virtual bool DoWriteString(const wxString& key, const wxString& szValue) wxOVERRIDE;
-  virtual bool DoWriteLong(const wxString& key, long lValue) wxOVERRIDE;
+  virtual bool DoWriteString(const wxString& key, const wxString& szValue) override;
+  virtual bool DoWriteLong(const wxString& key, long lValue) override;
 #if wxUSE_BASE64
-  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) wxOVERRIDE;
+  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) override;
 #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 wxOVERRIDE { return new wxFileCtrlEvent( *this ); }
+    virtual wxEvent *Clone() const override { return new wxFileCtrlEvent( *this ); }
 
     void SetFiles( const wxArrayString &files ) { m_files = files; }
     void SetDirectory( const wxString &directory ) { m_directory = directory; }

include/wx/filedlgcustomize.h

@@ -49,7 +49,7 @@ protected:
 
     // By default custom controls don't generate any events, but some of them
     // override this function to allow connecting to the selected events.
-    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE;
+    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override;
 
 
     wxFileDialogCustomControlImpl* const m_impl;
@@ -65,7 +65,7 @@ public:
     explicit wxFileDialogButton(wxFileDialogButtonImpl* impl);
 
 protected:
-    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE;
+    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override;
 
 private:
     wxFileDialogButtonImpl* GetImpl() const;
@@ -84,7 +84,7 @@ public:
     explicit wxFileDialogCheckBox(wxFileDialogCheckBoxImpl* impl);
 
 protected:
-    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE;
+    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override;
 
 private:
     wxFileDialogCheckBoxImpl* GetImpl() const;
@@ -103,7 +103,7 @@ public:
     explicit wxFileDialogRadioButton(wxFileDialogRadioButtonImpl* impl);
 
 protected:
-    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE;
+    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override;
 
 private:
     wxFileDialogRadioButtonImpl* GetImpl() const;
@@ -122,7 +122,7 @@ public:
     explicit wxFileDialogChoice(wxFileDialogChoiceImpl* impl);
 
 protected:
-    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) wxOVERRIDE;
+    virtual bool OnDynamicBind(wxDynamicEventTableEntry& entry) override;
 
 private:
     wxFileDialogChoiceImpl* GetImpl() const;

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 wxOVERRIDE { return new wxFileDirPickerEvent(*this); }
+    virtual wxEvent *Clone() const override { return new wxFileDirPickerEvent(*this); }
 
 private:
     wxString m_path;
@@ -179,8 +179,8 @@ public:         // public API
 
 public:        // internal functions
 
-    void UpdatePickerFromTextCtrl() wxOVERRIDE;
-    void UpdateTextCtrlFromPicker() wxOVERRIDE;
+    void UpdatePickerFromTextCtrl() override;
+    void UpdateTextCtrlFromPicker() override;
 
     // event handler for our picker
     void OnFileDirChange(wxFileDirPickerEvent &);
@@ -270,15 +270,15 @@ public:
 public:     // overrides
 
     // return the text control value in canonical form
-    wxString GetTextCtrlValue() const wxOVERRIDE;
+    wxString GetTextCtrlValue() const override;
 
-    bool IsCwdToUpdate() const wxOVERRIDE
+    bool IsCwdToUpdate() const override
         { return HasFlag(wxFLP_CHANGE_DIR); }
 
-    wxEventType GetEventType() const wxOVERRIDE
+    wxEventType GetEventType() const override
         { return wxEVT_FILEPICKER_CHANGED; }
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE
+    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) override
     {
         sender->Bind(wxEVT_FILEPICKER_CHANGED,
             &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink );
@@ -290,7 +290,7 @@ protected:
     wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent,
                                             const wxString& path,
                                             const wxString& message,
-                                            const wxString& wildcard) wxOVERRIDE
+                                            const wxString& wildcard) override
     {
         return new wxFilePickerWidget(parent, wxID_ANY,
                                       wxGetTranslation(wxFilePickerWidgetLabel),
@@ -300,7 +300,7 @@ protected:
     }
 
     // extracts the style for our picker from wxFileDirPickerCtrlBase's style
-    long GetPickerStyle(long style) const wxOVERRIDE
+    long GetPickerStyle(long style) const override
     {
         return style & (wxFLP_OPEN |
                         wxFLP_SAVE |
@@ -369,15 +369,15 @@ public:
 
 public:     // overrides
 
-    wxString GetTextCtrlValue() const wxOVERRIDE;
+    wxString GetTextCtrlValue() const override;
 
-    bool IsCwdToUpdate() const wxOVERRIDE
+    bool IsCwdToUpdate() const override
         { return HasFlag(wxDIRP_CHANGE_DIR); }
 
-    wxEventType GetEventType() const wxOVERRIDE
+    wxEventType GetEventType() const override
         { return wxEVT_DIRPICKER_CHANGED; }
 
-    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) wxOVERRIDE
+    virtual void DoConnect( wxControl *sender, wxFileDirPickerCtrlBase *eventSink ) override
     {
         sender->Bind( wxEVT_DIRPICKER_CHANGED,
             &wxFileDirPickerCtrlBase::OnFileDirChange, eventSink );
@@ -389,7 +389,7 @@ protected:
     wxFileDirPickerWidgetBase *CreatePicker(wxWindow *parent,
                                             const wxString& path,
                                             const wxString& message,
-                                            const wxString& WXUNUSED(wildcard)) wxOVERRIDE
+                                            const wxString& WXUNUSED(wildcard)) override
     {
         return new wxDirPickerWidget(parent, wxID_ANY,
                                      wxGetTranslation(wxDirPickerWidgetLabel),
@@ -399,7 +399,7 @@ protected:
     }
 
     // extracts the style for our picker from wxFileDirPickerCtrlBase's style
-    long GetPickerStyle(long style) const wxOVERRIDE
+    long GetPickerStyle(long style) const override
     {
         return style & (wxDIRP_DIR_MUST_EXIST |
                         wxDIRP_CHANGE_DIR |

include/wx/filesys.h

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

include/wx/fontmap.h

@@ -202,7 +202,7 @@ public:
     // returns the encoding for the given charset (in the form of RFC 2046) or
     // wxFONTENCODING_SYSTEM if couldn't decode it
     virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
-                                             bool interactive = true) wxOVERRIDE;
+                                             bool interactive = true) override;
 
     // find an alternative for the given encoding (which is supposed to not be
     // available on this system). If successful, return true and fill info
@@ -242,7 +242,7 @@ public:
     static wxFontMapper *Get();
 
     // pseudo-RTTI since we aren't a wxObject.
-    virtual bool IsDummy() wxOVERRIDE { return false; }
+    virtual bool IsDummy() override { return false; }
 
 protected:
     // GetAltForEncoding() helper: tests for the existence of the given

include/wx/fontpicker.h

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

include/wx/frame.h

@@ -73,7 +73,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 wxOVERRIDE;
+    virtual wxPoint GetClientAreaOrigin() const override;
 
 
     // menu bar functions
@@ -167,10 +167,10 @@ public:
 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window
-    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) wxOVERRIDE;
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE) override;
 
     // Implement internal behaviour (menu updating on some platforms)
-    virtual void OnInternalIdle() wxOVERRIDE;
+    virtual void OnInternalIdle() override;
 
 #if wxUSE_MENUS || wxUSE_TOOLBAR
     // show help text for the currently selected menu or toolbar item
@@ -179,7 +179,7 @@ public:
     virtual void DoGiveHelp(const wxString& text, bool show);
 #endif
 
-    virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE
+    virtual bool IsClientAreaChild(const wxWindow *child) const override
     {
         return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
     }
@@ -193,7 +193,7 @@ protected:
     void DeleteAllBars();
 
     // test whether this window makes part of the frame
-    virtual bool IsOneOfBars(const wxWindow *win) const wxOVERRIDE;
+    virtual bool IsOneOfBars(const wxWindow *win) const override;
 
 #if wxUSE_MENUBAR
     // 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) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
-    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext() wxOVERRIDE;
+    virtual bool CanOpen(const wxString& location) override;
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override;
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) override;
+    virtual wxString FindNext() override;
     void Cleanup();
     virtual ~wxArchiveFSHandler();
 

include/wx/fs_filter.h

@@ -25,11 +25,11 @@ public:
     wxFilterFSHandler() : wxFileSystemHandler() { }
     virtual ~wxFilterFSHandler() { }
 
-    virtual bool CanOpen(const wxString& location) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
+    virtual bool CanOpen(const wxString& location) override;
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override;
 
-    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext() wxOVERRIDE;
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) override;
+    virtual wxString FindNext() override;
 
 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) wxOVERRIDE;
-        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
+        virtual bool CanOpen(const wxString& location) override;
+        virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override;
 };
 
 #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) wxOVERRIDE;
-    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) wxOVERRIDE;
-    virtual wxString FindFirst(const wxString& spec, int flags = 0) wxOVERRIDE;
-    virtual wxString FindNext() wxOVERRIDE;
+    virtual bool CanOpen(const wxString& location) override;
+    virtual wxFSFile* OpenFile(wxFileSystem& fs, const wxString& location) override;
+    virtual wxString FindFirst(const wxString& spec, int flags = 0) override;
+    virtual wxString FindNext() override;
 
 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 wxOVERRIDE
+    virtual wxEvent* Clone() const override
     {
         wxFileSystemWatcherEvent* evt = new wxFileSystemWatcherEvent(*this);
         evt->m_errorMsg = m_errorMsg.Clone();
@@ -169,7 +169,7 @@ public:
         return evt;
     }
 
-    virtual wxEventCategory GetEventCategory() const wxOVERRIDE
+    virtual wxEventCategory GetEventCategory() const override
     {
         // TODO this has to be merged with "similar" categories and changed
         return wxEVT_CATEGORY_UNKNOWN;

include/wx/gauge.h

@@ -84,7 +84,7 @@ public:
     bool IsVertical() const { return HasFlag(wxGA_VERTICAL); }
 
     // overridden base class virtuals
-    virtual bool AcceptsFocus() const wxOVERRIDE { return false; }
+    virtual bool AcceptsFocus() const override { return false; }
 
     // Deprecated methods not doing anything since a long time.
     wxDEPRECATED_MSG("Remove calls to this method, it doesn't do anything")
@@ -100,7 +100,7 @@ public:
     int GetBezelFace() const { return 0; }
 
 protected:
-    virtual wxBorder GetDefaultBorder() const wxOVERRIDE { return wxBORDER_NONE; }
+    virtual wxBorder GetDefaultBorder() const override { return wxBORDER_NONE; }
 
     // Initialize m_appProgressIndicator if necessary, i.e. if this object has
     // wxGA_PROGRESS style. This method is supposed to be called from the

include/wx/gbsizer.h

@@ -291,8 +291,8 @@ public:
 
 
     // These are what make the sizer do size calculations and layout
-    virtual wxSize CalcMin() wxOVERRIDE;
-    virtual void RepositionChildren(const wxSize& minSize) wxOVERRIDE;
+    virtual wxSize CalcMin() override;
+    virtual void RepositionChildren(const wxSize& minSize) override;
 
 
     // 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 ) wxOVERRIDE;
+    virtual wxSizerItem* Insert( size_t index, wxSizerItem *item ) override;
     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 wxOVERRIDE
+    virtual wxObjectRefData *CreateRefData() const override
     {
         return CreateGDIRefData();
     }
 
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override
     {
         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 wxOVERRIDE;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const wxOVERRIDE;
+    virtual wxObjectRefData *CreateRefData() const override;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const override;
 
 private:
     wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);

include/wx/generic/activityindicator.h

@@ -49,12 +49,12 @@ public:
 
     virtual ~wxActivityIndicatorGeneric();
 
-    virtual void Start() wxOVERRIDE;
-    virtual void Stop() wxOVERRIDE;
-    virtual bool IsRunning() const wxOVERRIDE;
+    virtual void Start() override;
+    virtual void Stop() override;
+    virtual bool IsRunning() const override;
 
 protected:
-    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestClientSize() const override;
 
 private:
     class wxActivityIndicatorImpl *m_impl;

include/wx/generic/animate.h

@@ -48,21 +48,21 @@ public:
 
 
 public:
-    virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
-    virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) wxOVERRIDE;
+    virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY) override;
+    virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY) override;
 
-    virtual void Stop() wxOVERRIDE;
-    virtual bool Play() wxOVERRIDE
+    virtual void Stop() override;
+    virtual bool Play() override
         { return Play(true /* looped */); }
-    virtual bool IsPlaying() const wxOVERRIDE
+    virtual bool IsPlaying() const override
         { return m_isPlaying; }
 
-    void SetAnimation(const wxAnimation &animation) wxOVERRIDE;
+    void SetAnimation(const wxAnimation &animation) override;
 
-    virtual void SetInactiveBitmap(const wxBitmapBundle &bmp) wxOVERRIDE;
+    virtual void SetInactiveBitmap(const wxBitmapBundle &bmp) override;
 
     // override base class method
-    virtual bool SetBackgroundColour(const wxColour& col) wxOVERRIDE;
+    virtual bool SetBackgroundColour(const wxColour& col) override;
 
     static wxAnimation CreateCompatibleAnimation();
 
@@ -93,7 +93,7 @@ public:     // extended API specific to this implementation of wxAnimateCtrl
         { return m_backingStore; }
 
 protected:      // internal utilities
-    virtual wxAnimationImpl* DoCreateAnimationImpl() const wxOVERRIDE;
+    virtual wxAnimationImpl* DoCreateAnimationImpl() const override;
 
     // resize this control to fit m_animation
     void FitToAnimation();
@@ -107,8 +107,8 @@ protected:      // internal utilities
     bool RebuildBackingStoreUpToFrame(unsigned int);
     void DrawFrame(wxDC &dc, unsigned int);
 
-    virtual void DisplayStaticImage() wxOVERRIDE;
-    virtual wxSize DoGetBestSize() const wxOVERRIDE;
+    virtual void DisplayStaticImage() override;
+    virtual wxSize DoGetBestSize() const override;
 
     // This function can be used as event handler for wxEVT_DPI_CHANGED event
     // and simply calls UpdateStaticImage() to refresh the m_bmpStaticReal when it happens.

include/wx/generic/bmpcbox.h

@@ -84,7 +84,7 @@ public:
 
     virtual ~wxBitmapComboBox();
 
-    virtual wxString GetStringSelection() const wxOVERRIDE;
+    virtual wxString GetStringSelection() const override;
 
     // Adds item with image to the end of the combo box.
     int Append(const wxString& item, const wxBitmapBundle& bitmap = wxBitmapBundle());
@@ -100,30 +100,30 @@ public:
                unsigned int pos, wxClientData *clientData);
 
     // Sets the image for the given item.
-    virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) wxOVERRIDE;
-    virtual bool SetFont(const wxFont& font) wxOVERRIDE;
+    virtual void SetItemBitmap(unsigned int n, const wxBitmapBundle& bitmap) override;
+    virtual bool SetFont(const wxFont& font) override;
 
 protected:
 
-    virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE;
-    virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const wxOVERRIDE;
-    virtual wxCoord OnMeasureItem(size_t item) const wxOVERRIDE;
-    virtual wxCoord OnMeasureItemWidth(size_t item) const wxOVERRIDE;
+    virtual void OnDrawBackground(wxDC& dc, const wxRect& rect, int item, int flags) const override;
+    virtual void OnDrawItem(wxDC& dc, const wxRect& rect, int item, int flags) const override;
+    virtual wxCoord OnMeasureItem(size_t item) const override;
+    virtual wxCoord OnMeasureItemWidth(size_t item) const override;
 
     // Event handlers
     void OnSize(wxSizeEvent& event);
 
-    virtual wxSize DoGetBestSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const override;
 
-    virtual wxItemContainer* GetItemContainer() wxOVERRIDE { return this; }
-    virtual wxWindow* GetControl() wxOVERRIDE { return this; }
+    virtual wxItemContainer* GetItemContainer() override { return this; }
+    virtual wxWindow* GetControl() override { return this; }
 
     // wxItemContainer implementation
     virtual int DoInsertItems(const wxArrayStringsAdapter & items,
                               unsigned int pos,
-                              void **clientData, wxClientDataType type) wxOVERRIDE;
-    virtual void DoClear() wxOVERRIDE;
-    virtual void DoDeleteOneItem(unsigned int n) wxOVERRIDE;
+                              void **clientData, wxClientDataType type) override;
+    virtual void DoClear() override;
+    virtual void DoDeleteOneItem(unsigned int n) override;
 
 private:
     bool                m_inResize;

include/wx/generic/buttonbar.h

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

include/wx/generic/calctrlg.h

@@ -46,22 +46,22 @@ public:
 
     virtual ~wxGenericCalendarCtrl();
 
-    virtual bool Destroy() wxOVERRIDE;
+    virtual bool Destroy() override;
 
     // set/get the current date
     // ------------------------
 
-    virtual bool SetDate(const wxDateTime& date) wxOVERRIDE;
-    virtual wxDateTime GetDate() const wxOVERRIDE { return m_date; }
+    virtual bool SetDate(const wxDateTime& date) override;
+    virtual wxDateTime GetDate() const override { return m_date; }
 
 
     // set/get the range in which selection can occur
     // ---------------------------------------------
 
     virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime,
-                              const wxDateTime& upperdate = wxDefaultDateTime) wxOVERRIDE;
+                              const wxDateTime& upperdate = wxDefaultDateTime) override;
 
-    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const wxOVERRIDE;
+    virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const override;
 
     // these functions are for generic version only, don't use them but use the
     // Set/GetDateRange() above instead
@@ -79,7 +79,7 @@ public:
     // should be used instead for them
 
     // corresponds to wxCAL_NO_MONTH_CHANGE bit
-    virtual bool EnableMonthChange(bool enable = true) wxOVERRIDE;
+    virtual bool EnableMonthChange(bool enable = true) override;
 
     // corresponds to wxCAL_NO_YEAR_CHANGE bit, deprecated, generic only
     void EnableYearChange(bool enable = true);
@@ -88,48 +88,48 @@ public:
     // customization
     // -------------
 
-    virtual void Mark(size_t day, bool mark) wxOVERRIDE;
+    virtual void Mark(size_t day, bool mark) override;
 
     // all other functions in this section are for generic version only
 
     // header colours are used for painting the weekdays at the top
-    virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE
+    virtual void SetHeaderColours(const wxColour& colFg, const wxColour& colBg) override
     {
         m_colHeaderFg = colFg;
         m_colHeaderBg = colBg;
     }
 
-    virtual const wxColour& GetHeaderColourFg() const wxOVERRIDE { return m_colHeaderFg; }
-    virtual const wxColour& GetHeaderColourBg() const wxOVERRIDE { return m_colHeaderBg; }
+    virtual const wxColour& GetHeaderColourFg() const override { return m_colHeaderFg; }
+    virtual const wxColour& GetHeaderColourBg() const override { return m_colHeaderBg; }
 
     // highlight colour is used for the currently selected date
-    virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE
+    virtual void SetHighlightColours(const wxColour& colFg, const wxColour& colBg) override
     {
         m_colHighlightFg = colFg;
         m_colHighlightBg = colBg;
     }
 
-    virtual const wxColour& GetHighlightColourFg() const wxOVERRIDE { return m_colHighlightFg; }
-    virtual const wxColour& GetHighlightColourBg() const wxOVERRIDE { return m_colHighlightBg; }
+    virtual const wxColour& GetHighlightColourFg() const override { return m_colHighlightFg; }
+    virtual const wxColour& GetHighlightColourBg() const override { return m_colHighlightBg; }
 
     // holiday colour is used for the holidays (if style & wxCAL_SHOW_HOLIDAYS)
-    virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) wxOVERRIDE
+    virtual void SetHolidayColours(const wxColour& colFg, const wxColour& colBg) override
     {
         m_colHolidayFg = colFg;
         m_colHolidayBg = colBg;
     }
 
-    virtual const wxColour& GetHolidayColourFg() const wxOVERRIDE { return m_colHolidayFg; }
-    virtual const wxColour& GetHolidayColourBg() const wxOVERRIDE { return m_colHolidayBg; }
+    virtual const wxColour& GetHolidayColourFg() const override { return m_colHolidayFg; }
+    virtual const wxColour& GetHolidayColourBg() const override { return m_colHolidayBg; }
 
-    virtual wxCalendarDateAttr *GetAttr(size_t day) const wxOVERRIDE
+    virtual wxCalendarDateAttr *GetAttr(size_t day) const override
     {
         wxCHECK_MSG( day > 0 && day < 32, NULL, wxT("invalid day") );
 
         return m_attrs[day - 1];
     }
 
-    virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) wxOVERRIDE
+    virtual void SetAttr(size_t day, wxCalendarDateAttr *attr) override
     {
         wxCHECK_RET( day > 0 && day < 32, wxT("invalid day") );
 
@@ -137,24 +137,24 @@ public:
         m_attrs[day - 1] = attr;
     }
 
-    virtual void ResetAttr(size_t day) wxOVERRIDE { SetAttr(day, NULL); }
+    virtual void ResetAttr(size_t day) override { SetAttr(day, NULL); }
 
-    virtual void SetHoliday(size_t day) wxOVERRIDE;
+    virtual void SetHoliday(size_t day) override;
 
     virtual wxCalendarHitTestResult HitTest(const wxPoint& pos,
                                             wxDateTime *date = NULL,
-                                            wxDateTime::WeekDay *wd = NULL) wxOVERRIDE;
+                                            wxDateTime::WeekDay *wd = NULL) override;
 
     // implementation only from now on
     // -------------------------------
 
     // forward these functions to all subcontrols
-    virtual bool Enable(bool enable = true) wxOVERRIDE;
-    virtual bool Show(bool show = true) wxOVERRIDE;
+    virtual bool Enable(bool enable = true) override;
+    virtual bool Show(bool show = true) override;
 
-    virtual void SetWindowStyleFlag(long style) wxOVERRIDE;
+    virtual void SetWindowStyleFlag(long style) override;
 
-    virtual wxVisualAttributes GetDefaultAttributes() const wxOVERRIDE
+    virtual wxVisualAttributes GetDefaultAttributes() const override
         { return GetClassDefaultAttributes(GetWindowVariant()); }
 
     static wxVisualAttributes
@@ -164,9 +164,9 @@ public:
 
 protected:
     // override some base class virtuals
-    virtual wxSize DoGetBestSize() const wxOVERRIDE;
-    virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
-    virtual void DoGetSize(int *width, int *height) const wxOVERRIDE;
+    virtual wxSize DoGetBestSize() const override;
+    virtual void DoMoveWindow(int x, int y, int width, int height) override;
+    virtual void DoGetSize(int *width, int *height) const override;
 
 private:
     // common part of all ctors
@@ -248,8 +248,8 @@ public:
     wxControl *GetYearControl() const;
 
 private:
-    virtual void ResetHolidayAttrs() wxOVERRIDE;
-    virtual void RefreshHolidays() wxOVERRIDE { Refresh(); }
+    virtual void ResetHolidayAttrs() override;
+    virtual void RefreshHolidays() override { Refresh(); }
 
     // OnPaint helper-methods
 

include/wx/generic/caret.h

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

include/wx/generic/choicdgg.h

@@ -201,13 +201,13 @@ public:
     wxArrayInt GetSelections() const { return m_selections; }
 
     // implementation from now on
-    virtual bool TransferDataFromWindow() wxOVERRIDE;
+    virtual bool TransferDataFromWindow() override;
 
 protected:
 #if wxUSE_CHECKLISTBOX
     virtual wxListBoxBase *CreateList(int n,
                                       const wxString *choices,
-                                      long styleLbox) wxOVERRIDE;
+                                      long styleLbox) override;
 #endif // wxUSE_CHECKLISTBOX
 
     wxArrayInt m_selections;

include/wx/generic/clrpickerg.h

@@ -67,9 +67,9 @@ public:
 protected:
     wxBitmap    m_bitmap;
 
-    wxSize DoGetBestSize() const wxOVERRIDE;
+    wxSize DoGetBestSize() const override;
 
-    void UpdateColour() wxOVERRIDE;
+    void UpdateColour() override;
 
     void OnDPIChanged(wxDPIChangedEvent& event);
 

include/wx/generic/collheaderctrl.h

@@ -39,14 +39,14 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxASCII_STR(wxCollapsibleHeaderCtrlNameStr));
 
-    virtual void SetCollapsed(bool collapsed = true) wxOVERRIDE;
+    virtual void SetCollapsed(bool collapsed = true) override;
 
-    virtual bool IsCollapsed() const wxOVERRIDE
+    virtual bool IsCollapsed() const override
         { return m_collapsed; }
 
 protected:
 
-    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestClientSize() const override;
 
 private:
     bool m_collapsed;

include/wx/generic/collpaneg.h

@@ -52,16 +52,16 @@ public:
                 const wxString& name = wxASCII_STR(wxCollapsiblePaneNameStr));
 
     // public wxCollapsiblePane API
-    virtual void Collapse(bool collapse = true) wxOVERRIDE;
-    virtual void SetLabel(const wxString &label) wxOVERRIDE;
+    virtual void Collapse(bool collapse = true) override;
+    virtual void SetLabel(const wxString &label) override;
 
-    virtual bool IsCollapsed() const wxOVERRIDE
+    virtual bool IsCollapsed() const override
         { return m_pPane==NULL || !m_pPane->IsShown(); }
-    virtual wxWindow *GetPane() const wxOVERRIDE
+    virtual wxWindow *GetPane() const override
         { return m_pPane; }
-    virtual wxString GetLabel() const wxOVERRIDE;
+    virtual wxString GetLabel() const override;
 
-    virtual bool Layout() wxOVERRIDE;
+    virtual bool Layout() override;
 
 
     // for the generic collapsible pane only:
@@ -73,7 +73,7 @@ public:
 
 protected:
     // overridden methods
-    virtual wxSize DoGetBestClientSize() const wxOVERRIDE;
+    virtual wxSize DoGetBestClientSize() const override;
 
     int GetBorder() const;
 

include/wx/generic/colrdlgg.h

@@ -44,7 +44,7 @@ public:
 
     wxColourData &GetColourData() { return m_colourData; }
 
-    virtual int ShowModal() wxOVERRIDE;
+    virtual int ShowModal() override;
 
     // Internal functions
     void OnMouseEvent(wxMouseEvent& event);

include/wx/generic/combo.h

@@ -68,7 +68,7 @@ public:
 
     void SetCustomPaintWidth( int width );
 
-    virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const wxOVERRIDE;
+    virtual bool IsKeyPopupToggle(const wxKeyEvent& event) const override;
 
     static int GetFeatures() { return wxComboCtrlFeatures::All; }
 
@@ -88,18 +88,18 @@ protected:
     virtual WXWidget GetTextWidget() const { return NULL; }
 #elif defined(__WXGTK__)
 #if defined(__WXGTK20__)
-    virtual GtkEditable *GetEditable() const wxOVERRIDE { return NULL; }
-    virtual GtkEntry *GetEntry() const wxOVERRIDE { return NULL; }
+    virtual GtkEditable *GetEditable() const override { return NULL; }
+    virtual GtkEntry *GetEntry() const override { return NULL; }
 #endif
 #elif defined(__WXOSX__)
-    virtual wxTextWidgetImpl * GetTextPeer() const wxOVERRIDE;
+    virtual wxTextWidgetImpl * GetTextPeer() const override;
 #endif
 
     // For better transparent background rendering
-    virtual bool HasTransparentBackground() wxOVERRIDE;
+    virtual bool HasTransparentBackground() override;
 
     // Mandatory virtuals
-    virtual void OnResize() wxOVERRIDE;
+    virtual void OnResize() override;
 
     // Event handlers
     void OnPaintEvent( wxPaintEvent& event );

include/wx/generic/custombgwin.h

@@ -61,7 +61,7 @@ public:
     wxCustomBackgroundWindow() { }
 
 protected:
-    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) wxOVERRIDE
+    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp) override
     {
         m_bitmapBg = bmp;