Add wxOVERRIDE to test files

And cleanup some tailing spaces and tabs.

tests/controls/bitmapcomboboxtest.cpp

@@ -34,17 +34,17 @@ class BitmapComboBoxTestCase : public TextEntryTestCase,
 public:
     BitmapComboBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_combo; }
-    virtual wxWindow *GetTestWindow() const { return m_combo; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual wxItemContainer *GetContainer() const { return m_combo; }
-    virtual wxWindow *GetContainerWindow() const { return m_combo; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual void CheckStringSelection(const char * WXUNUSED(sel))
+    virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE
     {
         // do nothing here, as explained in TextEntryTestCase comment, our
         // GetStringSelection() is the wxChoice, not wxTextEntry, one and there

tests/controls/bitmaptogglebuttontest.cpp

@@ -31,8 +31,8 @@ class BitmapToggleButtonTestCase : public CppUnit::TestCase
 public:
     BitmapToggleButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( BitmapToggleButtonTestCase );

tests/controls/buttontest.cpp

@@ -32,8 +32,8 @@ class ButtonTestCase : public CppUnit::TestCase
 public:
     ButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( ButtonTestCase );
@@ -164,7 +164,7 @@ void ButtonTestCase::Bitmap()
     CPPUNIT_ASSERT(!m_button->GetBitmap().IsOk());
 
 
-    m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, 
+    m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION,
                                                wxART_OTHER,
                                                wxSize(32, 32)));
 

tests/controls/checkboxtest.cpp

@@ -26,8 +26,8 @@ class CheckBoxTestCase : public CppUnit::TestCase
 public:
     CheckBoxTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( CheckBoxTestCase );

tests/controls/checklistboxtest.cpp

@@ -27,12 +27,12 @@ class CheckListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestC
 public:
     CheckListBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_check; }
-    virtual wxWindow *GetContainerWindow() const { return m_check; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_check; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_check; }
 
     CPPUNIT_TEST_SUITE( CheckListBoxTestCase );
         wxITEM_CONTAINER_TESTS();

tests/controls/choicebooktest.cpp

@@ -27,16 +27,16 @@ class ChoicebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     ChoicebookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_choicebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_choicebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_CHOICEBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_CHOICEBOOK_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( ChoicebookTestCase );

tests/controls/choicetest.cpp

@@ -26,12 +26,12 @@ class ChoiceTestCase : public ItemContainerTestCase, public CppUnit::TestCase
 public:
     ChoiceTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_choice; }
-    virtual wxWindow *GetContainerWindow() const { return m_choice; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_choice; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_choice; }
 
     CPPUNIT_TEST_SUITE( ChoiceTestCase );
         wxITEM_CONTAINER_TESTS();

tests/controls/comboboxtest.cpp

@@ -37,17 +37,17 @@ class ComboBoxTestCase : public TextEntryTestCase, public ItemContainerTestCase,
 public:
     ComboBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_combo; }
-    virtual wxWindow *GetTestWindow() const { return m_combo; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual wxItemContainer *GetContainer() const { return m_combo; }
-    virtual wxWindow *GetContainerWindow() const { return m_combo; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual void CheckStringSelection(const char * WXUNUSED(sel))
+    virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE
     {
         // do nothing here, as explained in TextEntryTestCase comment, our
         // GetStringSelection() is the wxChoice, not wxTextEntry, one and there
@@ -64,7 +64,7 @@ private:
 //  TODO on OS X only works interactively
 //   WXUISIM_TEST( Editable );
     CPPUNIT_TEST( Hint );
-    CPPUNIT_TEST( CopyPaste ); 
+    CPPUNIT_TEST( CopyPaste );
     CPPUNIT_TEST( UndoRedo );
 #else
         wxTEXT_ENTRY_TESTS();

tests/controls/dataviewctrltest.cpp

@@ -32,8 +32,8 @@ class DataViewCtrlTestCase : public CppUnit::TestCase
 public:
     DataViewCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( DataViewCtrlTestCase );

tests/controls/datepickerctrltest.cpp

@@ -30,8 +30,8 @@ class DatePickerCtrlTestCase : public CppUnit::TestCase
 public:
     DatePickerCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( DatePickerCtrlTestCase );

tests/controls/frametest.cpp

@@ -24,8 +24,8 @@ class FrameTestCase : public CppUnit::TestCase
 public:
     FrameTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( FrameTestCase );

tests/controls/gaugetest.cpp

@@ -24,8 +24,8 @@ class GaugeTestCase : public CppUnit::TestCase
 public:
     GaugeTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( GaugeTestCase );

tests/controls/gridtest.cpp

@@ -42,8 +42,8 @@ class GridTestCase : public CppUnit::TestCase
 public:
     GridTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( GridTestCase );

tests/controls/headerctrltest.cpp

@@ -31,8 +31,8 @@ class HeaderCtrlTestCase : public CppUnit::TestCase
 public:
     HeaderCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( HeaderCtrlTestCase );

tests/controls/htmllboxtest.cpp

@@ -25,12 +25,12 @@ class HtmlListBoxTestCase : public ItemContainerTestCase,
 public:
     HtmlListBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_htmllbox; }
-    virtual wxWindow *GetContainerWindow() const { return m_htmllbox; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_htmllbox; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_htmllbox; }
 
     CPPUNIT_TEST_SUITE( HtmlListBoxTestCase );
         wxITEM_CONTAINER_TESTS();

tests/controls/hyperlinkctrltest.cpp

@@ -28,8 +28,8 @@ class HyperlinkCtrlTestCase : public CppUnit::TestCase
 public:
     HyperlinkCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( HyperlinkCtrlTestCase );

tests/controls/label.cpp

@@ -33,8 +33,8 @@ class LabelTestCase : public CppUnit::TestCase
 public:
     LabelTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( LabelTestCase );

tests/controls/listbasetest.cpp

@@ -179,7 +179,7 @@ void ListBaseTestCase::ChangeMode()
 
 void ListBaseTestCase::ItemClick()
 {
-#if wxUSE_UIACTIONSIMULATOR 
+#if wxUSE_UIACTIONSIMULATOR
 
 #ifdef __WXMSW__
     // FIXME: This test fails on MSW buildbot slaves although works fine on
@@ -226,7 +226,7 @@ void ListBaseTestCase::ItemClick()
 
     // when the first item was selected the focus changes to it, but not
     // on subsequent clicks
-    
+
     // FIXME: This test fail under wxGTK & wxOSX because we get 3 FOCUSED events and
     //        2 SELECTED ones instead of the one of each we expect for some
     //        reason, this needs to be debugged as it may indicate a bug in the

tests/controls/listbooktest.cpp

@@ -28,16 +28,16 @@ class ListbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     ListbookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_listbook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_listbook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_LISTBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_LISTBOOK_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( ListbookTestCase );

tests/controls/listboxtest.cpp

@@ -28,12 +28,12 @@ class ListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestCase
 public:
     ListBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_list; }
-    virtual wxWindow *GetContainerWindow() const { return m_list; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_list; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_list; }
 
     CPPUNIT_TEST_SUITE( ListBoxTestCase );
         wxITEM_CONTAINER_TESTS();

tests/controls/listctrltest.cpp

@@ -37,10 +37,10 @@ class ListCtrlTestCase : public ListBaseTestCase, public CppUnit::TestCase
 public:
     ListCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
-    virtual wxListCtrl *GetList() const { return m_list; }
+    virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; }
 
 private:
     CPPUNIT_TEST_SUITE( ListCtrlTestCase );

tests/controls/listviewtest.cpp

@@ -24,10 +24,10 @@ class ListViewTestCase : public ListBaseTestCase, public CppUnit::TestCase
 public:
     ListViewTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
-    virtual wxListCtrl *GetList() const { return m_list; }
+    virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; }
 
 private:
     CPPUNIT_TEST_SUITE( ListViewTestCase );

tests/controls/notebooktest.cpp

@@ -27,16 +27,16 @@ class NotebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     NotebookTestCase() { m_notebook = NULL; m_numPageChanges = 0; }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_notebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_notebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_NOTEBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_NOTEBOOK_PAGE_CHANGING; }
 
 

tests/controls/ownerdrawncomboboxtest.cpp

@@ -39,17 +39,17 @@ class OwnerDrawnComboBoxTestCase : public TextEntryTestCase,
 public:
     OwnerDrawnComboBoxTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_combo; }
-    virtual wxWindow *GetTestWindow() const { return m_combo; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual wxItemContainer *GetContainer() const { return m_combo; }
-    virtual wxWindow *GetContainerWindow() const { return m_combo; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; }
 
-    virtual void CheckStringSelection(const char * WXUNUSED(sel))
+    virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE
     {
         // do nothing here, as explained in TextEntryTestCase comment, our
         // GetStringSelection() is the wxChoice, not wxTextEntry, one and there

tests/controls/pickertest.cpp

@@ -30,11 +30,11 @@ class ColourPickerCtrlTestCase : public PickerBaseTestCase,
 public:
     ColourPickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_colour; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_colour; }
 
     CPPUNIT_TEST_SUITE( ColourPickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
@@ -74,11 +74,11 @@ class DirPickerCtrlTestCase : public PickerBaseTestCase,
 public:
     DirPickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_dir; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_dir; }
 
     CPPUNIT_TEST_SUITE( DirPickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
@@ -119,11 +119,11 @@ class FilePickerCtrlTestCase : public PickerBaseTestCase,
 public:
     FilePickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_file; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_file; }
 
     CPPUNIT_TEST_SUITE( FilePickerCtrlTestCase );
         wxPICKER_BASE_TESTS();
@@ -165,11 +165,11 @@ class FontPickerCtrlTestCase : public PickerBaseTestCase,
 public:
     FontPickerCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxPickerBase *GetBase() const { return m_font; }
+    virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_font; }
 
     CPPUNIT_TEST_SUITE( FontPickerCtrlTestCase );
         wxPICKER_BASE_TESTS();

tests/controls/radioboxtest.cpp

@@ -26,8 +26,8 @@ class RadioBoxTestCase : public CppUnit::TestCase
 public:
     RadioBoxTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( RadioBoxTestCase );

tests/controls/radiobuttontest.cpp

@@ -27,8 +27,8 @@ class RadioButtonTestCase : public CppUnit::TestCase
 public:
     RadioButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( RadioButtonTestCase );

tests/controls/rearrangelisttest.cpp

@@ -25,12 +25,12 @@ class RearrangeListTestCase : public ItemContainerTestCase, public CppUnit::Test
 public:
     RearrangeListTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxItemContainer *GetContainer() const { return m_rearrange; }
-    virtual wxWindow *GetContainerWindow() const { return m_rearrange; }
+    virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_rearrange; }
+    virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_rearrange; }
 
     CPPUNIT_TEST_SUITE( RearrangeListTestCase );
         wxITEM_CONTAINER_TESTS();

tests/controls/richtextctrltest.cpp

@@ -29,8 +29,8 @@ class RichTextCtrlTestCase : public CppUnit::TestCase
 public:
     RichTextCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( RichTextCtrlTestCase );

tests/controls/simplebooktest.cpp

@@ -27,16 +27,16 @@ class SimplebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     SimplebookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_simplebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_simplebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
         { return wxEVT_BOOKCTRL_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
         { return wxEVT_BOOKCTRL_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( SimplebookTestCase );

tests/controls/slidertest.cpp

@@ -27,8 +27,8 @@ class SliderTestCase : public CppUnit::TestCase
 public:
     SliderTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SliderTestCase );

tests/controls/spinctrldbltest.cpp

@@ -25,8 +25,8 @@ class SpinCtrlDoubleTestCase : public CppUnit::TestCase
 public:
     SpinCtrlDoubleTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SpinCtrlDoubleTestCase );

tests/controls/spinctrltest.cpp

@@ -27,8 +27,8 @@ class SpinCtrlTestCase : public CppUnit::TestCase
 public:
     SpinCtrlTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( SpinCtrlTestCase );

tests/controls/textctrltest.cpp

@@ -41,12 +41,12 @@ class TextCtrlTestCase : public TextEntryTestCase, public CppUnit::TestCase
 public:
     TextCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxTextEntry *GetTestEntry() const { return m_text; }
-    virtual wxWindow *GetTestWindow() const { return m_text; }
+    virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_text; }
+    virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_text; }
 
     #define SINGLE_AND_MULTI_TESTS() \
         WXUISIM_TEST( ReadOnly ); \
@@ -223,7 +223,7 @@ void TextCtrlTestCase::ReadOnly()
 
     // SetEditable() is supposed to override wxTE_READONLY
     m_text->SetEditable(true);
-    
+
 #if defined(__WXOSX__) || defined(__WXUNIVERSAL__)
     // a ready only text field might not have been focusable at all
     m_text->SetFocus();

tests/controls/togglebuttontest.cpp

@@ -27,8 +27,8 @@ class ToggleButtonTestCase : public CppUnit::TestCase
 public:
     ToggleButtonTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( ToggleButtonTestCase );

tests/controls/toolbooktest.cpp

@@ -28,19 +28,19 @@ class ToolbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     ToolbookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_toolbook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_toolbook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
     { return wxEVT_TOOLBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
     { return wxEVT_TOOLBOOK_PAGE_CHANGING; }
 
-    virtual void Realize() { m_toolbook->GetToolBar()->Realize(); }
+    virtual void Realize() wxOVERRIDE { m_toolbook->GetToolBar()->Realize(); }
 
     CPPUNIT_TEST_SUITE( ToolbookTestCase );
         wxBOOK_CTRL_BASE_TESTS();

tests/controls/treebooktest.cpp

@@ -27,16 +27,16 @@ class TreebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase
 public:
     TreebookTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
-    virtual wxBookCtrlBase *GetBase() const { return m_treebook; }
+    virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_treebook; }
 
-    virtual wxEventType GetChangedEvent() const
+    virtual wxEventType GetChangedEvent() const wxOVERRIDE
         { return wxEVT_TREEBOOK_PAGE_CHANGED; }
 
-    virtual wxEventType GetChangingEvent() const
+    virtual wxEventType GetChangingEvent() const wxOVERRIDE
         { return wxEVT_TREEBOOK_PAGE_CHANGING; }
 
     CPPUNIT_TEST_SUITE( TreebookTestCase );

tests/controls/treectrltest.cpp

@@ -38,8 +38,8 @@ class TreeCtrlTestCase : public CppUnit::TestCase
 public:
     TreeCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( TreeCtrlTestCase );

tests/controls/treelistctrltest.cpp

@@ -31,8 +31,8 @@ class TreeListCtrlTestCase : public CppUnit::TestCase
 public:
     TreeListCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( TreeListCtrlTestCase );

tests/controls/virtlistctrltest.cpp

@@ -33,8 +33,8 @@ class VirtListCtrlTestCase : public CppUnit::TestCase
 public:
     VirtListCtrlTestCase() { }
 
-    virtual void setUp();
-    virtual void tearDown();
+    virtual void setUp() wxOVERRIDE;
+    virtual void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( VirtListCtrlTestCase );

tests/controls/webtest.cpp

@@ -31,8 +31,8 @@ class WebTestCase : public CppUnit::TestCase
 public:
     WebTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( WebTestCase );

tests/controls/windowtest.cpp

@@ -31,8 +31,8 @@ class WindowTestCase : public CppUnit::TestCase
 public:
     WindowTestCase() { }
 
-    void setUp();
-    void tearDown();
+    void setUp() wxOVERRIDE;
+    void tearDown() wxOVERRIDE;
 
 private:
     CPPUNIT_TEST_SUITE( WindowTestCase );