Merge branch 'more-wxoverride' of https://github.com/MaartenBent/wxWidgets

See https://github.com/wxWidgets/wxWidgets/pull/944

build/cmake/demos/CMakeLists.txt

@@ -45,33 +45,55 @@ endfunction()
 
 wx_add_demo(bombs
     bombs.cpp
+    bombs.h
     bombs1.cpp
     game.cpp
+    game.h
     )
+
 wx_add_demo(forty
-    forty.cpp
     canvas.cpp
+    canvas.h
     card.cpp
+    card.h
+    forty.cpp
+    forty.h
     game.cpp
+    game.h
     pile.cpp
+    pile.h
     playerdg.cpp
+    playerdg.h
     scoredg.cpp
+    scoredg.h
     scorefil.cpp
+    scorefil.h
     DATA
         about.htm
     LIBRARIES
         html xml
     )
-wx_add_demo(fractal fractal.cpp)
+
+wx_add_demo(fractal
+    fractal.cpp
+    )
+
 wx_add_demo(life
-    life.cpp
     dialogs.cpp
+    dialogs.h
     game.cpp
+    game.h
+    life.cpp
+    life.h
     reader.cpp
+    reader.h
     DATA
         breeder.lif
     )
-wx_add_demo(poem wxpoem.cpp
+
+wx_add_demo(poem
+    wxpoem.cpp
+    wxpoem.h
     DATA
         wxpoem.txt wxpoem.dat wxpoem.idx
     LIBRARIES

build/cmake/tests/drawing/CMakeLists.txt

@@ -24,6 +24,7 @@ set(TEST_DRAWING_SRC
     testprec.h
     testableframe.h
     testimage.h
+    drawing/drawing.h
     drawing/gcfactory.h
     drawing/plugin.h
     drawing/pluginsample.cpp

demos/bombs/bombs.h

@@ -21,7 +21,7 @@ class BombsFrame;
 class BombsApp: public wxApp
 {
 public:
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
 
 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);
+    virtual void OnDraw(wxDC& dc) wxOVERRIDE;
     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();
+    bool OnInit() wxOVERRIDE;
 
     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);
+    void Redraw(wxDC& dc) wxOVERRIDE;
-    void ResetPile() { m_topCard = NumCards - 1; }
+    void ResetPile() wxOVERRIDE { m_topCard = NumCards - 1; }
     void Shuffle();
-    void AddCard(Card* card); // Add card
+    void AddCard(Card* card) wxOVERRIDE; // Add card
-    void AddCard(wxDC& dc, Card* card) { AddCard(card); Redraw(dc); }
+    void AddCard(wxDC& dc, Card* card) wxOVERRIDE { AddCard(card); Redraw(dc); }
 };
 
 
@@ -39,7 +39,7 @@ class Base : public Pile {
 public:
     Base(int x, int y);
     virtual ~Base(){}
-    bool AcceptCard(Card* card);
+    bool AcceptCard(Card* card) wxOVERRIDE;
 };
 
 
@@ -50,7 +50,7 @@ class Foundation : public Pile {
 public:
     Foundation(int x, int y);
     virtual ~Foundation(){}
-    bool AcceptCard(Card* card);
+    bool AcceptCard(Card* card) wxOVERRIDE;
 };
 
 
@@ -61,9 +61,9 @@ class Discard : public Pile {
 public:
     Discard(int x, int y);
     virtual ~Discard(){}
-    void Redraw(wxDC& dc);
+    void Redraw(wxDC& dc) wxOVERRIDE;
-    void GetTopCardPos(int& x, int& y);
+    void GetTopCardPos(int& x, int& y) wxOVERRIDE;
-    Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset);
+    Card* RemoveTopCard(wxDC& dc, int m_xOffset, int m_yOffset) wxOVERRIDE;
 };
 
 

demos/forty/scoredg.h

@@ -27,7 +27,7 @@ private:
     ScoreFile* m_scoreFile;
     wxButton* m_OK;
 
-	wxDECLARE_EVENT_TABLE();
+    wxDECLARE_EVENT_TABLE();
 };
 
 #endif

demos/fractal/fractal.cpp

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

demos/life/game.cpp

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

demos/life/life.cpp

@@ -431,10 +431,10 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
             m_running = true;
             m_topspeed = true;
             UpdateUI();
-            
+
             const long YIELD_INTERVAL = 1000 / 30;
             wxMilliClock_t lastyield = 0, now;
-            
+
             while (m_running && m_topspeed)
             {
                 OnStep();
@@ -444,7 +444,7 @@ void LifeFrame::OnMenu(wxCommandEvent& event)
                     lastyield = now;
                 }
             }
- 
+
             break;
         }
     }
@@ -797,17 +797,17 @@ void LifeCanvas::DrawCell(wxInt32 i, wxInt32 j, wxDC &dc)
 void LifeCanvas::DrawChanged()
 {
     wxClientDC dc(this);
-    
+
     size_t ncells;
     LifeCell *cells;
     bool done = false;
-    
+
     m_life->BeginFind(m_viewportX,
                       m_viewportY,
                       m_viewportX + m_viewportW,
                       m_viewportY + m_viewportH,
                       true);
-    
+
     if (m_cellsize == 1)
     {
         dc.SetPen(*wxWHITE_PEN);
@@ -818,11 +818,11 @@ void LifeCanvas::DrawChanged()
         dc.SetBrush(*wxWHITE_BRUSH);
     }
     dc.SetLogicalFunction(wxXOR);
-    
+
     while (!done)
     {
         done = m_life->FindMore(&cells, &ncells);
-        
+
         for (size_t m = 0; m < ncells; m++)
             DrawCell(cells[m].i, cells[m].j, dc);
     }

demos/life/life.h

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

demos/poem/wxpoem.h

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

include/wx/hash.h

@@ -275,7 +275,7 @@ private:
         eltype *Delete(long lhash, long key)                                  \
             { return (eltype*)DoDelete(key, lhash); }                         \
     private:                                                                  \
-        virtual void DoDeleteContents( wxHashTableBase_Node* node )           \
+        virtual void DoDeleteContents( wxHashTableBase_Node* node ) wxOVERRIDE\
             { delete (eltype*)node->GetData(); }                              \
                                                                               \
         wxDECLARE_NO_COPY_CLASS(hashclass);                                   \

include/wx/testing.h

@@ -163,7 +163,7 @@ public:
     }
 
 protected:
-    virtual int Invoke(wxDialog *dlg) const
+    virtual int Invoke(wxDialog *dlg) const wxOVERRIDE
     {
         DialogType *t = dynamic_cast<DialogType*>(dlg);
         if ( t )
@@ -173,7 +173,7 @@ protected:
     }
 
     /// Returns description of the expected dialog (by default, its class).
-    virtual wxString GetDefaultDescription() const
+    virtual wxString GetDefaultDescription() const wxOVERRIDE
     {
         return wxGetDialogClassDescription<T>(wxCLASSINFO(T));
     }
@@ -220,7 +220,7 @@ public:
     }
 
 protected:
-    virtual int OnInvoked(T *WXUNUSED(dlg)) const
+    virtual int OnInvoked(T *WXUNUSED(dlg)) const wxOVERRIDE
     {
         return m_id;
     }
@@ -239,7 +239,7 @@ public:
     }
 
 protected:
-    virtual wxString GetDefaultDescription() const
+    virtual wxString GetDefaultDescription() const wxOVERRIDE
     {
         // It can be useful to show which buttons the expected message box was
         // supposed to have, in case there could have been several of them.
@@ -289,7 +289,7 @@ public:
     }
 
 protected:
-    virtual int OnInvoked(wxFileDialog *dlg) const
+    virtual int OnInvoked(wxFileDialog *dlg) const wxOVERRIDE
     {
         dlg->SetPath(m_path);
         return m_id;
@@ -351,7 +351,7 @@ public:
     }
 
 protected:
-    virtual int Enter(wxDialog *dlg)
+    virtual int Enter(wxDialog *dlg) wxOVERRIDE
     {
         while ( !m_expectations.empty() )
         {

samples/access/accesstest.cpp

@@ -76,7 +76,7 @@ public:
     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
 
 };
 
@@ -199,7 +199,7 @@ public:
     FrameAccessible(wxWindow* win): wxWindowAccessible(win) {}
 
             // Gets the name of the specified object.
-    virtual wxAccStatus GetName(int childId, wxString* name)
+    virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE
     {
         if (childId == wxACC_SELF)
         {
@@ -217,7 +217,7 @@ public:
     ScrolledWindowAccessible(wxWindow* win): wxWindowAccessible(win) {}
 
             // Gets the name of the specified object.
-    virtual wxAccStatus GetName(int childId, wxString* name)
+    virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE
     {
         if (childId == wxACC_SELF)
         {
@@ -235,36 +235,36 @@ public:
     SplitterWindowAccessible(wxWindow* win): wxWindowAccessible(win) {}
 
             // Gets the name of the specified object.
-    virtual wxAccStatus GetName(int childId, wxString* name);
+    virtual wxAccStatus GetName(int childId, wxString* name) wxOVERRIDE;
 
         // Can return either a child object, or an integer
         // representing the child element, starting from 1.
-    virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject);
+    virtual wxAccStatus HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) wxOVERRIDE;
 
         // Returns the rectangle for this object (id = 0) or a child element (id > 0).
-    virtual wxAccStatus GetLocation(wxRect& rect, int elementId);
+    virtual wxAccStatus GetLocation(wxRect& rect, int elementId) wxOVERRIDE;
 
         // Navigates from fromId to toId/toObject.
     virtual wxAccStatus Navigate(wxNavDir navDir, int fromId,
-                int* toId, wxAccessible** toObject);
+                int* toId, wxAccessible** toObject) wxOVERRIDE;
 
         // Gets the number of children.
-    virtual wxAccStatus GetChildCount(int* childCount);
+    virtual wxAccStatus GetChildCount(int* childCount) wxOVERRIDE;
 
         // Gets the specified child (starting from 1).
         // If *child is NULL and return value is wxACC_OK,
         // this means that the child is a simple element and
         // not an accessible object.
-    virtual wxAccStatus GetChild(int childId, wxAccessible** child);
+    virtual wxAccStatus GetChild(int childId, wxAccessible** child) wxOVERRIDE;
 
         // Gets the parent, or NULL.
-    virtual wxAccStatus GetParent(wxAccessible** parent);
+    virtual wxAccStatus GetParent(wxAccessible** parent) wxOVERRIDE;
 
         // Performs the default action. childId is 0 (the action for this object)
         // or > 0 (the action for a child).
         // Return wxACC_NOT_SUPPORTED if there is no default action for this
         // window (e.g. an edit control).
-    virtual wxAccStatus DoDefaultAction(int childId);
+    virtual wxAccStatus DoDefaultAction(int childId) wxOVERRIDE;
 
         // Gets the default action for this object (0) or > 0 (the action for a child).
         // Return wxACC_OK even if there is no action. actionName is the action, or the empty
@@ -272,36 +272,36 @@ public:
         // The retrieved string describes the action that is performed on an object,
         // not what the object does as a result. For example, a toolbar button that prints
         // a document has a default action of "Press" rather than "Prints the current document."
-    virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName);
+    virtual wxAccStatus GetDefaultAction(int childId, wxString* actionName) wxOVERRIDE;
 
         // Returns the description for this object or a child.
-    virtual wxAccStatus GetDescription(int childId, wxString* description);
+    virtual wxAccStatus GetDescription(int childId, wxString* description) wxOVERRIDE;
 
         // Returns help text for this object or a child, similar to tooltip text.
-    virtual wxAccStatus GetHelpText(int childId, wxString* helpText);
+    virtual wxAccStatus GetHelpText(int childId, wxString* helpText) wxOVERRIDE;
 
         // Returns the keyboard shortcut for this object or child.
         // Return e.g. ALT+K
-    virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut);
+    virtual wxAccStatus GetKeyboardShortcut(int childId, wxString* shortcut) wxOVERRIDE;
 
         // Returns a role constant.
-    virtual wxAccStatus GetRole(int childId, wxAccRole* role);
+    virtual wxAccStatus GetRole(int childId, wxAccRole* role) wxOVERRIDE;
 
         // Returns a state constant.
-    virtual wxAccStatus GetState(int childId, long* state);
+    virtual wxAccStatus GetState(int childId, long* state) wxOVERRIDE;
 
         // Returns a localized string representing the value for the object
         // or child.
-    virtual wxAccStatus GetValue(int childId, wxString* strValue);
+    virtual wxAccStatus GetValue(int childId, wxString* strValue) wxOVERRIDE;
 
         // Selects the object or child.
-    virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags);
+    virtual wxAccStatus Select(int childId, wxAccSelectionFlags selectFlags) wxOVERRIDE;
 
         // Gets the window with the keyboard focus.
         // If childId is 0 and child is NULL, no object in
         // this subhierarchy has the focus.
         // If this object has the focus, child should be 'this'.
-    virtual wxAccStatus GetFocus(int* childId, wxAccessible** child);
+    virtual wxAccStatus GetFocus(int* childId, wxAccessible** child) wxOVERRIDE;
 
         // Gets a variant representing the selected children
         // of this object.
@@ -311,7 +311,7 @@ public:
         // - an integer representing the selected child element,
         //   or 0 if this object is selected (GetType() == wxT("long"))
         // - a "void*" pointer to a wxAccessible child object
-    virtual wxAccStatus GetSelections(wxVariant* selections);
+    virtual wxAccStatus GetSelections(wxVariant* selections) wxOVERRIDE;
 
 };
 

samples/dll/wx_exe.cpp

@@ -58,8 +58,8 @@ public:
 class MainApp : public wxApp
 {
 public:
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
-    virtual int OnExit();
+    virtual int OnExit() wxOVERRIDE;
 };
 
 

samples/nativdlg/nativdlg.h

@@ -13,7 +13,7 @@ class MyApp: public wxApp
 {
   public:
     MyApp(void){};
-    bool OnInit(void);
+    bool OnInit(void) wxOVERRIDE;
 };
 
 class MyFrame: public wxFrame

samples/ownerdrw/ownerdrw.cpp

@@ -31,7 +31,7 @@
 class OwnerDrawnApp: public wxApp
 {
 public:
-    bool OnInit();
+    bool OnInit() wxOVERRIDE;
 };
 
 // Define a new frame type

samples/regtest/regtest.cpp

@@ -42,7 +42,7 @@
 class RegApp : public wxApp
 {
 public:
-    bool OnInit();
+    bool OnInit() wxOVERRIDE;
 };
 
 // ----------------------------------------------------------------------------

tests/any/anytest.cpp

@@ -487,15 +487,15 @@ public:
         m_value = value;
     }
 
-    virtual bool Eq(wxVariantData& WXUNUSED(data)) const
+    virtual bool Eq(wxVariantData& WXUNUSED(data)) const wxOVERRIDE
     {
         return false;
     }
 
     // What type is it? Return a string name.
-    virtual wxString GetType() const { return "MyClass"; }
+    virtual wxString GetType() const wxOVERRIDE { return "MyClass"; }
 
-    virtual wxVariantData* Clone() const
+    virtual wxVariantData* Clone() const wxOVERRIDE
     {
         return new wxMyVariantData(m_value);
     }

tests/archive/archivetest.cpp

@@ -1159,7 +1159,7 @@ template <class NotifierT, class EntryT>
 class ArchiveNotifier : public NotifierT
 {
 public:
-    void OnEntryUpdated(EntryT& WXUNUSED(entry)) { }
+    void OnEntryUpdated(EntryT& WXUNUSED(entry)) wxOVERRIDE { }
 };
 
 template <class ClassFactoryT>

tests/archive/archivetest.h

@@ -42,8 +42,8 @@ public:
     ~TestOutputStream() { delete [] m_data; }
 
     int GetOptions() const { return m_options; }
-    wxFileOffset GetLength() const { return m_size; }
+    wxFileOffset GetLength() const wxOVERRIDE { return m_size; }
-    bool IsSeekable() const { return (m_options & PipeOut) == 0; }
+    bool IsSeekable() const wxOVERRIDE { return (m_options & PipeOut) == 0; }
 
     // gives away the data, this stream is then empty, and can be reused
     void GetData(char*& data, size_t& size);
@@ -51,9 +51,9 @@ public:
 private:
     void Init();
 
-    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
-    wxFileOffset OnSysTell() const;
+    wxFileOffset OnSysTell() const wxOVERRIDE;
-    size_t OnSysWrite(const void *buffer, size_t size);
+    size_t OnSysWrite(const void *buffer, size_t size) wxOVERRIDE;
 
     int m_options;
     size_t m_pos;
@@ -71,7 +71,7 @@ public:
         AtLast    = 0x01,   // eof before an attempt to read past the last byte
         WithError = 0x02    // give an error instead of eof
     };
-    
+
     // ctor takes the data from the output stream, which is then empty
     TestInputStream(TestOutputStream& out, int eoftype)
         : m_data(NULL), m_eoftype(eoftype) { SetData(out); }
@@ -80,17 +80,17 @@ public:
     ~TestInputStream() { delete [] m_data; }
 
     void Rewind();
-    wxFileOffset GetLength() const { return m_size; }
+    wxFileOffset GetLength() const wxOVERRIDE { return m_size; }
-    bool IsSeekable() const { return (m_options & PipeIn) == 0; }
+    bool IsSeekable() const wxOVERRIDE { return (m_options & PipeIn) == 0; }
     void SetData(TestOutputStream& out);
 
     void Chop(size_t size) { m_size = size; }
     char& operator [](size_t pos) { return m_data[pos]; }
 
 private:
-    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode);
+    wxFileOffset OnSysSeek(wxFileOffset pos, wxSeekMode mode) wxOVERRIDE;
-    wxFileOffset OnSysTell() const;
+    wxFileOffset OnSysTell() const wxOVERRIDE;
-    size_t OnSysRead(void *buffer, size_t size);
+    size_t OnSysRead(void *buffer, size_t size) wxOVERRIDE;
 
     int m_options;
     size_t m_pos;
@@ -171,7 +171,7 @@ protected:
     typedef typename ClassFactoryT::pairiter_type  PairIterT;
 
     // the entry point for the test
-    void runTest();
+    void runTest() wxOVERRIDE;
 
     // create the test data
     void CreateTestData();

tests/archive/ziptest.cpp

@@ -42,19 +42,19 @@ public:
     { }
 
 protected:
-    void OnCreateArchive(wxZipOutputStream& zip);
+    void OnCreateArchive(wxZipOutputStream& zip) wxOVERRIDE;
 
-    void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal);
+    void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal) wxOVERRIDE;
 
     void OnCreateEntry(wxZipOutputStream& zip,
                        TestEntry& testEntry,
-                       wxZipEntry *entry);
+                       wxZipEntry *entry) wxOVERRIDE;
 
     void OnEntryExtracted(wxZipEntry& entry,
                           const TestEntry& testEntry,
-                          wxZipInputStream *arc);
+                          wxZipInputStream *arc) wxOVERRIDE;
 
-    void OnSetNotifier(EntryT& entry);
+    void OnSetNotifier(EntryT& entry) wxOVERRIDE;
 
     int m_count;
     wxString m_comment;
@@ -136,7 +136,7 @@ void ZipTestCase::OnEntryExtracted(wxZipEntry& entry,
 class ZipNotifier : public wxZipNotifier
 {
 public:
-    void OnEntryUpdated(wxZipEntry& entry);
+    void OnEntryUpdated(wxZipEntry& entry) wxOVERRIDE;
 };
 
 void ZipNotifier::OnEntryUpdated(wxZipEntry& entry)
@@ -166,7 +166,7 @@ public:
     { }
 
 protected:
-    void runTest();
+    void runTest() wxOVERRIDE;
     int m_options;
     int m_id;
 };

tests/cmdline/cmdlinetest.cpp

@@ -150,7 +150,7 @@ void CmdLineTestCase::ParseSwitches()
     class NoMessageOutput : public wxMessageOutput
     {
     public:
-        virtual void Output(const wxString& WXUNUSED(str)) { }
+        virtual void Output(const wxString& WXUNUSED(str)) wxOVERRIDE { }
     } noMessages;
 
     wxMessageOutput * const old = wxMessageOutput::Set(&noMessages);

tests/controls/dialogtest.cpp

@@ -111,7 +111,7 @@ public:
     wxExpectModal(int valueToSet) : m_valueToSet(valueToSet) {}
 
 protected:
-    virtual int OnInvoked(MyDialog *dlg) const
+    virtual int OnInvoked(MyDialog *dlg) const wxOVERRIDE
     {
         // Simulate the user entering the expected number:
         dlg->m_value = m_valueToSet;

tests/controls/itemcontainertest.cpp

@@ -282,7 +282,7 @@ void ItemContainerTestCase::SetSelection()
     class CommandEventHandler : public wxEvtHandler
     {
     public:
-        virtual bool ProcessEvent(wxEvent& event)
+        virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE
         {
             CPPUNIT_ASSERT_MESSAGE
             (

tests/controls/markuptest.cpp

@@ -57,30 +57,30 @@ void MarkupTestCase::RoundTrip()
         const wxString& GetText() const { return m_text; }
 
 
-        virtual void OnText(const wxString& text) { m_text += text; }
+        virtual void OnText(const wxString& text) wxOVERRIDE { m_text += text; }
 
-        virtual void OnBoldStart() { m_text += "<b>"; }
+        virtual void OnBoldStart() wxOVERRIDE { m_text += "<b>"; }
-        virtual void OnBoldEnd() { m_text += "</b>"; }
+        virtual void OnBoldEnd() wxOVERRIDE { m_text += "</b>"; }
 
-        virtual void OnItalicStart() { m_text += "<i>"; }
+        virtual void OnItalicStart() wxOVERRIDE { m_text += "<i>"; }
-        virtual void OnItalicEnd() { m_text += "</i>"; }
+        virtual void OnItalicEnd() wxOVERRIDE { m_text += "</i>"; }
 
-        virtual void OnUnderlinedStart() { m_text += "<u>"; }
+        virtual void OnUnderlinedStart() wxOVERRIDE { m_text += "<u>"; }
-        virtual void OnUnderlinedEnd() { m_text += "</u>"; }
+        virtual void OnUnderlinedEnd() wxOVERRIDE { m_text += "</u>"; }
 
-        virtual void OnStrikethroughStart() { m_text += "<s>"; }
+        virtual void OnStrikethroughStart() wxOVERRIDE { m_text += "<s>"; }
-        virtual void OnStrikethroughEnd() { m_text += "</s>"; }
+        virtual void OnStrikethroughEnd() wxOVERRIDE { m_text += "</s>"; }
 
-        virtual void OnBigStart() { m_text += "<big>"; }
+        virtual void OnBigStart() wxOVERRIDE { m_text += "<big>"; }
-        virtual void OnBigEnd() { m_text += "</big>"; }
+        virtual void OnBigEnd() wxOVERRIDE { m_text += "</big>"; }
 
-        virtual void OnSmallStart() { m_text += "<small>"; }
+        virtual void OnSmallStart() wxOVERRIDE { m_text += "<small>"; }
-        virtual void OnSmallEnd() { m_text += "</small>"; }
+        virtual void OnSmallEnd() wxOVERRIDE { m_text += "</small>"; }
 
-        virtual void OnTeletypeStart() { m_text += "<tt>"; }
+        virtual void OnTeletypeStart() wxOVERRIDE { m_text += "<tt>"; }
-        virtual void OnTeletypeEnd() { m_text += "</tt>"; }
+        virtual void OnTeletypeEnd() wxOVERRIDE { m_text += "</tt>"; }
 
-        virtual void OnSpanStart(const wxMarkupSpanAttributes& attrs)
+        virtual void OnSpanStart(const wxMarkupSpanAttributes& attrs) wxOVERRIDE
         {
             m_text << "<span";
 
@@ -131,7 +131,7 @@ void MarkupTestCase::RoundTrip()
             m_text << ">";
         }
 
-        virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(attrs))
+        virtual void OnSpanEnd(const wxMarkupSpanAttributes& WXUNUSED(attrs)) wxOVERRIDE
         {
             m_text += "</span>";
         }

tests/controls/virtlistctrltest.cpp

@@ -73,7 +73,7 @@ void VirtListCtrlTestCase::setUp()
         }
 
     protected:
-        virtual wxString OnGetItemText(long item, long column) const
+        virtual wxString OnGetItemText(long item, long column) const wxOVERRIDE
         {
             return wxString::Format("Row %ld, col %ld", item, column);
         }

tests/drawing/drawing.h

@@ -62,14 +62,14 @@ private:
     {
     public:
         virtual ~ImageGraphicsContextLifeCycle() {}
-        virtual wxString GetIdForFileName () const { return "image"; }
+        virtual wxString GetIdForFileName () const wxOVERRIDE { return "image"; }
-        virtual wxString GetExtensionForFileName () const { return "png"; }
+        virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "png"; }
-        virtual bool UseImageComparison() const { return true; }
+        virtual bool UseImageComparison() const wxOVERRIDE { return true; }
-        virtual bool PlatformIndependent() const { return false; }
+        virtual bool PlatformIndependent() const wxOVERRIDE { return false; }
         virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
-            double pointsPerInch, const wxFileName &targetFileName);
+            double pointsPerInch, const wxFileName &targetFileName) wxOVERRIDE;
-        virtual void SaveBuiltContext (wxGraphicsContext *&gc);
+        virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE;
-        virtual void CleanUp (wxGraphicsContext *gc);
+        virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE;
     private:
         wxImage *m_image;
         wxString m_targetFileName;
@@ -81,14 +81,14 @@ private:
     class SvgGraphicsContextLifeCycle: public DrawingTestGCFactory
     {
     public:
-        virtual wxString GetIdForFileName () const { return "svg"; }
+        virtual wxString GetIdForFileName () const wxOVERRIDE { return "svg"; }
-        virtual wxString GetExtensionForFileName () const { return "svg"; }
+        virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "svg"; }
-        virtual bool UseImageComparison() const { return false; }
+        virtual bool UseImageComparison() const wxOVERRIDE { return false; }
-        virtual bool PlatformIndependent() const { return true; }
+        virtual bool PlatformIndependent() const wxOVERRIDE { return true; }
         virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
-            double pointsPerInch, const wxFileName &targetFileName);
+            double pointsPerInch, const wxFileName &targetFileName) wxOVERRIDE;
-        virtual void SaveBuiltContext (wxGraphicsContext *&gc);
+        virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE;
-        virtual void CleanUp (wxGraphicsContext *gc);
+        virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE;
 
     private:
         wxSVGFileDC *m_svgFileDc;

tests/drawing/pluginsample.cpp

@@ -32,18 +32,18 @@ public:
 
     virtual ~SampleDrawingTestGCFactory() {
     }
-    virtual wxString GetIdForFileName () const { return "sample-plg"; }
+    virtual wxString GetIdForFileName () const wxOVERRIDE { return "sample-plg"; }
-    virtual wxString GetExtensionForFileName () const { return "bmp"; }
+    virtual wxString GetExtensionForFileName () const wxOVERRIDE { return "bmp"; }
 
     // Bitmaps are handled by wx code they should be binarily equal
-    virtual bool UseImageComparison() const { return false; }
+    virtual bool UseImageComparison() const wxOVERRIDE { return false; }
 
     // We use wxGraphicsContext, its implementation is not platform independent
     // and returns may slightly vary
-    virtual bool PlatformIndependent() const { return false; }
+    virtual bool PlatformIndependent() const wxOVERRIDE { return false; }
 
     virtual wxGraphicsContext *BuildNewContext (wxSize expectedSize,
-        double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) {
+        double WXUNUSED(pointsPerInch), const wxFileName &targetFileName) wxOVERRIDE {
         m_image = new wxImage (expectedSize);
         m_image->InitAlpha();
 
@@ -57,14 +57,14 @@ public:
     // Let's the opportunity to actually save the context and associated data
     // If saving requires deleting the wxGraphicsContext object the
     //  implementer is free to do it but @c gc must then be nulled
-    virtual void SaveBuiltContext (wxGraphicsContext *&gc) {
+    virtual void SaveBuiltContext (wxGraphicsContext *&gc) wxOVERRIDE {
         wxDELETE(gc);
 
         m_image->SaveFile (m_targetFileName);
     }
 
     // Cleans @c gc and internal data if any
-    virtual void CleanUp (wxGraphicsContext *gc) {
+    virtual void CleanUp (wxGraphicsContext *gc) wxOVERRIDE {
         delete gc;
         m_targetFileName.Empty();
         wxDELETE(m_image);

tests/events/evthandler.cpp

@@ -32,7 +32,7 @@ class MyEvent : public wxEvent
 public:
     MyEvent() : wxEvent(0, MyEventType) { }
 
-    virtual wxEvent *Clone() const { return new MyEvent; }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new MyEvent; }
 };
 
 typedef void (wxEvtHandler::*MyEventFunction)(MyEvent&);

tests/events/evtlooptest.cpp

@@ -63,7 +63,7 @@ public:
     {
     }
 
-    virtual void Notify()
+    virtual void Notify() wxOVERRIDE
     {
         m_loop.ScheduleExit(m_rc);
     }
@@ -87,7 +87,7 @@ public:
     {
     }
 
-    virtual void Notify()
+    virtual void Notify() wxOVERRIDE
     {
         wxEventLoop loopInner;
         ScheduleLoopExitTimer timerInner(loopInner, EXIT_CODE_INNER_LOOP);

tests/events/propagation.cpp

@@ -71,7 +71,7 @@ public:
 
     // override ProcessEvent() to confirm that it is called for all event
     // handlers in the chain
-    virtual bool ProcessEvent(wxEvent& event)
+    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE
     {
         if ( event.GetEventType() == m_evtType )
             g_str += 'o'; // "o" == "overridden"
@@ -190,7 +190,7 @@ public:
         Update();
     }
 
-    virtual void OnDraw(wxDC& WXUNUSED(dc))
+    virtual void OnDraw(wxDC& WXUNUSED(dc)) wxOVERRIDE
     {
         g_str += 'D';   // draw
     }
@@ -360,7 +360,7 @@ void EventPropagationTestCase::ForwardEvent()
     public:
         ForwardEvtHandler(wxEvtHandler& h) : m_h(&h) { }
 
-        virtual bool ProcessEvent(wxEvent& event)
+        virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE
         {
             g_str += 'f';
 
@@ -516,7 +516,7 @@ class EventTestView : public wxView
 public:
     EventTestView() { }
 
-    virtual void OnDraw(wxDC*) { }
+    virtual void OnDraw(wxDC*) wxOVERRIDE { }
 
     wxDECLARE_DYNAMIC_CLASS(EventTestView);
 };

tests/events/timertest.cpp

@@ -94,7 +94,7 @@ void TimerEventTestCase::OneShot()
         }
 
     private:
-        virtual void Tick() { m_loop.Exit(); }
+        virtual void Tick() wxOVERRIDE { m_loop.Exit(); }
 
         wxEventLoopBase& m_loop;
 

tests/exec/exec.cpp

@@ -135,7 +135,7 @@ private:
             return wxExecuteReturnCode;
         }
 
-        void Notify()
+        void Notify() wxOVERRIDE
         {
             // Run wxExecute inside the event loop.
             wxExecuteReturnCode = wxExecute(command, flags, callback);
@@ -323,7 +323,7 @@ public:
     }
 
     // may be overridden to be notified about process termination
-    virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status))
+    virtual void OnTerminate(int WXUNUSED(pid), int WXUNUSED(status)) wxOVERRIDE
     {
         wxEventLoop::GetActive()->ScheduleExit();
     }
@@ -469,7 +469,7 @@ void ExecTestCase::TestOverlappedSyncExecute()
             StartOnce(10);
         }
 
-        virtual void Notify()
+        virtual void Notify() wxOVERRIDE
         {
             wxExecute(m_command, m_outputArray);
         }

tests/file/dir.cpp

@@ -147,12 +147,12 @@ class TestDirTraverser : public wxDirTraverser
 public:
     wxArrayString dirs;
 
-    virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename))
+    virtual wxDirTraverseResult OnFile(const wxString& WXUNUSED(filename)) wxOVERRIDE
     {
         return wxDIR_CONTINUE;
     }
 
-    virtual wxDirTraverseResult OnDir(const wxString& dirname)
+    virtual wxDirTraverseResult OnDir(const wxString& dirname) wxOVERRIDE
     {
         dirs.push_back(dirname);
         return wxDIR_CONTINUE;

tests/filesys/filesystest.cpp

@@ -39,9 +39,9 @@ public:
     wxString RightLocation(const wxString& p) { return GetRightLocation(p); }
     wxString Anchor(const wxString& p) { return GetAnchor(p); }
 
-    bool CanOpen(const wxString& WXUNUSED(url)) { return false; }
+    bool CanOpen(const wxString& WXUNUSED(url)) wxOVERRIDE { return false; }
     wxFSFile *OpenFile(wxFileSystem& WXUNUSED(fs),
-                       const wxString& WXUNUSED(url)) { return NULL; }
+                       const wxString& WXUNUSED(url)) wxOVERRIDE { return NULL; }
 
 
 };

tests/fswatcher/fswatchertest.cpp

@@ -524,12 +524,12 @@ void FileSystemWatcherTestCase::TestEventCreate()
     class EventTester : public EventHandler
     {
     public:
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             CPPUNIT_ASSERT(eg.CreateFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_CREATE);
             event.SetPath(eg.m_file);
@@ -555,12 +555,12 @@ void FileSystemWatcherTestCase::TestEventDelete()
     class EventTester : public EventHandler
     {
     public:
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             CPPUNIT_ASSERT(eg.DeleteFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_DELETE);
             event.SetPath(eg.m_old);
@@ -588,12 +588,12 @@ void FileSystemWatcherTestCase::TestEventRename()
     class EventTester : public EventHandler
     {
     public:
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             CPPUNIT_ASSERT(eg.RenameFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_RENAME);
             event.SetPath(eg.m_old);
@@ -619,12 +619,12 @@ void FileSystemWatcherTestCase::TestEventModify()
     class EventTester : public EventHandler
     {
     public:
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             CPPUNIT_ASSERT(eg.ModifyFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_MODIFY);
             event.SetPath(eg.m_file);
@@ -650,12 +650,12 @@ void FileSystemWatcherTestCase::TestEventAccess()
     class EventTester : public EventHandler
     {
     public:
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             CPPUNIT_ASSERT(eg.ReadFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_ACCESS);
             event.SetPath(eg.m_file);
@@ -683,12 +683,12 @@ void FileSystemWatcherTestCase::TestEventAttribute()
     class EventTester : public EventHandler
     {
     public:
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             CPPUNIT_ASSERT(eg.TouchFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_ATTRIB);
             event.SetPath(eg.m_file);
@@ -718,7 +718,7 @@ void FileSystemWatcherTestCase::TestSingleWatchtypeEvent()
         // DELETE as the event path fields would be wrong in CheckResult()
         EventTester() : EventHandler(wxFSW_EVENT_ACCESS) {}
 
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             // As wxFSW_EVENT_ACCESS is passed to the ctor only ReadFile() will
             // generate an event. Without it they all will, and the test fails
@@ -727,7 +727,7 @@ void FileSystemWatcherTestCase::TestSingleWatchtypeEvent()
             CPPUNIT_ASSERT(eg.ReadFile());
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             wxFileSystemWatcherEvent event(wxFSW_EVENT_ACCESS);
             event.SetPath(eg.m_file);
@@ -925,7 +925,7 @@ void FileSystemWatcherTestCase::TestTrees()
             CPPUNIT_ASSERT_EQUAL(0, m_watcher->GetWatchedPathsCount());
         }
 
-        virtual void GenerateEvent()
+        virtual void GenerateEvent() wxOVERRIDE
         {
             // We don't use this function for events. Just run the tests
 
@@ -963,14 +963,14 @@ void FileSystemWatcherTestCase::TestTrees()
             Exit();
         }
 
-        virtual wxFileSystemWatcherEvent ExpectedEvent()
+        virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
         {
             CPPUNIT_FAIL("Shouldn't be called");
 
             return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR);
         }
 
-        virtual void CheckResult()
+        virtual void CheckResult() wxOVERRIDE
         {
             // Do nothing. We override this to prevent receiving events in
             // ExpectedEvent()
@@ -1016,25 +1016,25 @@ public:
         Start(1000, true);
     }
 
-    virtual void GenerateEvent()
+    virtual void GenerateEvent() wxOVERRIDE
     {
         m_watcher->Remove(EventGenerator::GetWatchDir());
         CPPUNIT_ASSERT(eg.CreateFile());
     }
 
-    virtual void CheckResult()
+    virtual void CheckResult() wxOVERRIDE
     {
         CPPUNIT_ASSERT( m_events.empty() );
     }
 
-    virtual wxFileSystemWatcherEvent ExpectedEvent()
+    virtual wxFileSystemWatcherEvent ExpectedEvent() wxOVERRIDE
     {
         CPPUNIT_FAIL( "Shouldn't be called" );
 
         return wxFileSystemWatcherEvent(wxFSW_EVENT_ERROR);
     }
 
-    virtual void Notify()
+    virtual void Notify() wxOVERRIDE
     {
         SendIdle();
     }

tests/html/htmlparser.cpp

@@ -30,10 +30,10 @@ TEST_CASE("wxHtmlParser::ParseInvalid", "[html][parser][error]")
     class NullParser : public wxHtmlWinParser
     {
     public:
-        virtual wxObject *GetProduct() { return NULL; }
+        virtual wxObject *GetProduct() wxOVERRIDE { return NULL; }
 
     protected:
-        virtual void AddText(const wxString& WXUNUSED(txt)) { }
+        virtual void AddText(const wxString& WXUNUSED(txt)) wxOVERRIDE { }
     };
 
     NullParser p;

tests/interactive/output.cpp

@@ -319,7 +319,7 @@ public:
     {
     }
 
-    virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH)
+    virtual void Walk(size_t skip = 1, size_t maxdepth = wxSTACKWALKER_MAX_DEPTH) wxOVERRIDE
     {
         wxPuts(wxT("Stack dump:"));
 
@@ -327,7 +327,7 @@ public:
     }
 
 protected:
-    virtual void OnStackFrame(const wxStackFrame& frame)
+    virtual void OnStackFrame(const wxStackFrame& frame) wxOVERRIDE
     {
         wxPrintf("[%2zu] ", frame.GetLevel());
 

tests/log/logtest.cpp

@@ -86,7 +86,7 @@ public:
 protected:
     virtual void DoLogRecord(wxLogLevel level,
                              const wxString& msg,
-                             const wxLogRecordInfo& info)
+                             const wxLogRecordInfo& info) wxOVERRIDE
     {
         m_logs[level] = msg;
         m_logsInfo[level] = info;

tests/misc/module.cpp

@@ -28,8 +28,8 @@ char g_strLoadOrder[256] = "\0";
 class Module : public wxModule
 {
 protected:
-    virtual bool OnInit() { wxStrcat(g_strLoadOrder, GetClassInfo()->GetClassName()); return true; }
+    virtual bool OnInit() wxOVERRIDE { wxStrcat(g_strLoadOrder, GetClassInfo()->GetClassName()); return true; }
-    virtual void OnExit() { }
+    virtual void OnExit() wxOVERRIDE { }
 };
 
 class ModuleA : public Module

tests/regex/regextest.cpp

@@ -77,7 +77,7 @@ public:
 
 protected:
     // run this testcase
-    void runTest();
+    void runTest() wxOVERRIDE;
 
 private:
     // workers

tests/regex/wxregextest.cpp

@@ -43,7 +43,7 @@ public:
     { }
 
 protected:
-    void runTest();
+    void runTest() wxOVERRIDE;
 
 private:
     wxString m_pattern;
@@ -80,7 +80,7 @@ public:
     { }
 
 protected:
-    void runTest();
+    void runTest() wxOVERRIDE;
 
 private:
     wxString m_pattern;
@@ -146,7 +146,7 @@ public:
     { }
 
 protected:
-    void runTest();
+    void runTest() wxOVERRIDE;
 
 private:
     wxString m_pattern;

tests/streams/fileback.cpp

@@ -33,7 +33,7 @@ public:
     TestStream(const void *buf, size_t size)
         : wxMemoryInputStream(buf, size) { }
 
-    wxFileOffset GetLength() const { return wxInvalidOffset; }
+    wxFileOffset GetLength() const wxOVERRIDE { return wxInvalidOffset; }
 };
 
 

tests/streams/largefile.cpp

@@ -70,7 +70,7 @@ public:
     virtual ~LargeFileTest() { }
 
 protected:
-    void runTest();
+    void runTest() wxOVERRIDE;
 
     virtual wxInputStream *MakeInStream(const wxString& name) const = 0;
     virtual wxOutputStream *MakeOutStream(const wxString& name) const = 0;
@@ -210,9 +210,9 @@ public:
     LargeFileTest_wxFile() : LargeFileTest("wxFile streams") { }
 
 protected:
-    wxInputStream *MakeInStream(const wxString& name) const;
+    wxInputStream *MakeInStream(const wxString& name) const wxOVERRIDE;
-    wxOutputStream *MakeOutStream(const wxString& name) const;
+    wxOutputStream *MakeOutStream(const wxString& name) const wxOVERRIDE;
-    bool HasLFS() const { return (wxFileOffset)0xffffffff > 0; }
+    bool HasLFS() const wxOVERRIDE { return (wxFileOffset)0xffffffff > 0; }
 };
 
 wxInputStream *LargeFileTest_wxFile::MakeInStream(const wxString& name) const
@@ -242,9 +242,9 @@ public:
     LargeFileTest_wxFFile() : LargeFileTest("wxFFile streams") { }
 
 protected:
-    wxInputStream *MakeInStream(const wxString& name) const;
+    wxInputStream *MakeInStream(const wxString& name) const wxOVERRIDE;
-    wxOutputStream *MakeOutStream(const wxString& name) const;
+    wxOutputStream *MakeOutStream(const wxString& name) const wxOVERRIDE;
-    bool HasLFS() const;
+    bool HasLFS() const wxOVERRIDE;
 };
 
 wxInputStream *LargeFileTest_wxFFile::MakeInStream(const wxString& name) const

tests/streams/socketstream.cpp

@@ -66,7 +66,7 @@ public:
     }
 
 protected:
-    virtual void *Entry()
+    virtual void *Entry() wxOVERRIDE
     {
         wxSocketServer srv(LocalAddress(m_port), wxSOCKET_REUSEADDR);
         CPPUNIT_ASSERT( srv.IsOk() );

tests/strings/vsnprintf.cpp

@@ -116,7 +116,7 @@ class VsnprintfTestCase : public CppUnit::TestCase
 public:
     VsnprintfTestCase() {}
 
-    virtual void setUp();
+    virtual void setUp() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( VsnprintfTestCase );

tests/test.cpp

@@ -186,11 +186,11 @@ public:
     TestApp();
 
     // standard overrides
-    virtual bool OnInit();
+    virtual bool OnInit() wxOVERRIDE;
-    virtual int  OnExit();
+    virtual int  OnExit() wxOVERRIDE;
 
 #ifdef __WIN32__
-    virtual wxAppTraits *CreateTraits()
+    virtual wxAppTraits *CreateTraits() wxOVERRIDE
     {
         // Define a new class just to customize CanUseStderr() behaviour.
         class TestAppTraits : public TestAppTraitsBase
@@ -200,11 +200,11 @@ public:
             // in this case we really don't want to show any message boxes, as
             // wxMessageOutputBest, used e.g. from the default implementation
             // of wxApp::OnUnhandledException(), would do by default.
-            virtual bool CanUseStderr() { return true; }
+            virtual bool CanUseStderr() wxOVERRIDE { return true; }
 
             // Overriding CanUseStderr() is not enough, we also need to
             // override this one to avoid returning false from it.
-            virtual bool WriteToStderr(const wxString& text)
+            virtual bool WriteToStderr(const wxString& text) wxOVERRIDE
             {
                 wxFputs(text, stderr);
                 fflush(stderr);
@@ -221,7 +221,7 @@ public:
 
     // Also override this method to avoid showing any dialogs from here -- and
     // show some details about the exception along the way.
-    virtual bool OnExceptionInMainLoop()
+    virtual bool OnExceptionInMainLoop() wxOVERRIDE
     {
         wxFprintf(stderr, "Unhandled exception in the main loop: %s\n",
                   Catch::translateActiveException());
@@ -230,8 +230,8 @@ public:
     }
 
     // used by events propagation test
-    virtual int FilterEvent(wxEvent& event);
+    virtual int FilterEvent(wxEvent& event) wxOVERRIDE;
-    virtual bool ProcessEvent(wxEvent& event);
+    virtual bool ProcessEvent(wxEvent& event) wxOVERRIDE;
 
     void SetFilterEventFunc(FilterEventFunc f) { m_filterEventFunc = f; }
     void SetProcessEventFunc(ProcessEventFunc f) { m_processEventFunc = f; }
@@ -269,7 +269,7 @@ public:
         event.Skip();
     }
 
-    virtual int OnRun()
+    virtual int OnRun() wxOVERRIDE
     {
         if ( TestAppBase::OnRun() != 0 )
             m_exitcode = EXIT_FAILURE;
@@ -277,7 +277,7 @@ public:
         return m_exitcode;
     }
 #else // !wxUSE_GUI
-    virtual int OnRun()
+    virtual int OnRun() wxOVERRIDE
     {
         return RunTests();
     }

tests/thread/atomic.cpp

@@ -62,7 +62,7 @@ private:
             m_operateOn(operateOn), m_testType(testType) {}
 
         // thread execution starts here
-        virtual void *Entry();
+        virtual void *Entry() wxOVERRIDE;
 
     public:
         wxAtomicInt &m_operateOn;

tests/thread/misc.cpp

@@ -37,7 +37,7 @@ public:
         { m_n = n; Create(); }
 
     // thread execution starts here
-    virtual ExitCode Entry();
+    virtual ExitCode Entry() wxOVERRIDE;
 
 private:
     size_t m_n;
@@ -70,10 +70,10 @@ public:
     }
 
     // thread execution starts here
-    virtual ExitCode Entry();
+    virtual ExitCode Entry() wxOVERRIDE;
 
     // and stops here
-    virtual void OnExit();
+    virtual void OnExit() wxOVERRIDE;
 
 private:
     size_t m_n; // number of characters to write
@@ -130,7 +130,7 @@ public:
         Create();
     }
 
-    virtual ExitCode Entry()
+    virtual ExitCode Entry() wxOVERRIDE
     {
         //wxPrintf(wxT("Thread %lu has started running.\n"), GetId());
         gs_cond.Post();
@@ -165,7 +165,7 @@ public:
         Create();
     }
 
-    virtual ExitCode Entry()
+    virtual ExitCode Entry() wxOVERRIDE
     {
         wxUnusedVar(m_i);
 

tests/thread/queue.cpp

@@ -55,7 +55,7 @@ private:
         {}
 
         // thread execution starts here
-        virtual void *Entry();
+        virtual void *Entry() wxOVERRIDE;
 
         // Thread message queue
         Queue& GetQueue()

tests/thread/tls.cpp

@@ -56,7 +56,7 @@ public:
     // ctor both creates and starts the thread
     TLSTestThread() : wxThread(wxTHREAD_JOINABLE) { Create(); Run(); }
 
-    virtual void *Entry()
+    virtual void *Entry() wxOVERRIDE
     {
         gs_threadInt = 17;
 

tests/weakref/evtconnection.cpp

@@ -37,7 +37,7 @@ class wxTestEvent : public wxEvent
 {
 public:
     wxTestEvent(wxEventType type = wxEVT_TEST) : wxEvent(0, type) { }
-    virtual wxEvent *Clone() const { return new wxTestEvent(GetEventType()); }
+    virtual wxEvent *Clone() const wxOVERRIDE { return new wxTestEvent(GetEventType()); }
 };
 
 class wxTestSink : public wxEvtHandler

tests/window/setsize.cpp

@@ -56,7 +56,7 @@ private:
         }
 
     protected:
-        virtual wxSize DoGetBestSize() const { return wxSize(50, 250); }
+        virtual wxSize DoGetBestSize() const wxOVERRIDE { return wxSize(50, 250); }
     };
 
     wxWindow *m_win;