Replace wxOVERRIDE and wxNOEXCEPT with override and noexcept

Don't use deprecated macros in wxWidgets itself.

tests/graphics/affinematrix.cpp

@@ -118,7 +118,7 @@ public:
     {
     }
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         m_bmpOrig = wxBitmap(m_imgOrig);
         m_bmpUsingMatrix.Create(m_bmpOrig.GetSize(), m_bmpOrig.GetDepth());
@@ -159,20 +159,20 @@ public:
     {
     }
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         TransformMatrixTestCaseDCBase::setUp();
         m_mdc.SelectObject(m_bmpUsingMatrix);
     }
 
-    virtual void tearDown() wxOVERRIDE
+    virtual void tearDown() override
     {
         m_mdc.SelectObject(wxNullBitmap);
         TransformMatrixTestCaseDCBase::tearDown();
     }
 
 protected:
-    virtual void FlushDC() wxOVERRIDE {}
+    virtual void FlushDC() override {}
 
 private:
     CPPUNIT_TEST_SUITE( TransformMatrixTestCaseDC );
@@ -207,7 +207,7 @@ public:
 
     virtual ~TransformMatrixTestCaseGCDC() {}
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         TransformMatrixTestCaseDC::setUp();
 
@@ -218,14 +218,14 @@ public:
         ctx->SetAntialiasMode(wxANTIALIAS_NONE);
     }
 
-    virtual void tearDown() wxOVERRIDE
+    virtual void tearDown() override
     {
         delete m_gcdc;
         TransformMatrixTestCaseDC::tearDown();
     }
 
 protected:
-    virtual void FlushDC() wxOVERRIDE
+    virtual void FlushDC() override
     {
         m_gcdc->GetGraphicsContext()->Flush();
     }
@@ -263,7 +263,7 @@ public:
 
     virtual ~TransformMatrixTestCaseGCDCGDIPlus() {}
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         TransformMatrixTestCaseGCDC::setUp();
 
@@ -299,7 +299,7 @@ public:
 
     virtual ~TransformMatrixTestCaseGCDCDirect2D() {}
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         TransformMatrixTestCaseGCDC::setUp();
 
@@ -308,7 +308,7 @@ public:
         m_gcdc->SetGraphicsContext(ctx);
     }
 
-    virtual void FlushDC() wxOVERRIDE
+    virtual void FlushDC() override
     {
         // Apparently, flushing native Direct2D renderer
         // is not enough to update underlying DC (bitmap)
@@ -347,7 +347,7 @@ public:
 
     virtual ~TransformMatrixTestCaseGCDCCairo() {}
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         TransformMatrixTestCaseGCDC::setUp();
 

tests/graphics/bitmap.cpp

@@ -1600,7 +1600,7 @@ public:
     {
     }
 
-    bool match(const wxBitmap& bmp) const wxOVERRIDE
+    bool match(const wxBitmap& bmp) const override
     {
         const wxImage img(bmp.ConvertToImage());
 
@@ -1617,7 +1617,7 @@ public:
         return true;
     }
 
-    std::string describe() const wxOVERRIDE
+    std::string describe() const override
     {
         return wxString::Format("doesn't have all %s pixels",
                                 m_col.GetAsString()).ToStdString();

tests/graphics/bmpbundle.cpp

@@ -160,7 +160,7 @@ public:
     {
     }
 
-    bool match(const BitmapAtScale& bitmapAtScale) const wxOVERRIDE
+    bool match(const BitmapAtScale& bitmapAtScale) const override
     {
         const wxBitmap& bmp = bitmapAtScale.bitmap;
 
@@ -183,7 +183,7 @@ public:
         return m_diffDesc.empty();
     }
 
-    std::string describe() const wxOVERRIDE
+    std::string describe() const override
     {
         return m_diffDesc.utf8_string();
     }

tests/graphics/boundingbox.cpp

@@ -44,7 +44,7 @@ public:
         m_bmp = wxNullBitmap;
     }
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         m_gcdc->ResetBoundingBox();
     }

tests/graphics/colour.cpp

@@ -32,12 +32,12 @@ public:
     {
     }
 
-    bool match(const wxColour& c) const wxOVERRIDE
+    bool match(const wxColour& c) const override
     {
         return c.Red() == m_red && c.Green() == m_green && c.Blue() == m_blue;
     }
 
-    std::string describe() const wxOVERRIDE
+    std::string describe() const override
     {
         return wxString::Format("!= RGB(%#02x, %#02x, %#02x)",
                                 m_red, m_green, m_blue).ToStdString();
@@ -57,12 +57,12 @@ public:
     {
     }
 
-    bool match(const wxColour& c) const wxOVERRIDE
+    bool match(const wxColour& c) const override
     {
         return ColourRGBMatcher::match(c) && c.Alpha() == m_alpha;
     }
 
-    std::string describe() const wxOVERRIDE
+    std::string describe() const override
     {
         return wxString::Format("!= RGBA(%#02x, %#02x, %#02x, %#02x)",
                                 m_red, m_green, m_blue, m_alpha).ToStdString();

tests/graphics/graphmatrix.cpp

@@ -39,13 +39,13 @@ public:
         m_bmp = wxNullBitmap;
     }
 
-    virtual void setUp() wxOVERRIDE
+    virtual void setUp() override
     {
         wxASSERT( m_rend );
         m_ctx = m_rend->CreateContext(m_dc);
     }
 
-    virtual void tearDown() wxOVERRIDE
+    virtual void tearDown() override
     {
         delete m_ctx;
         m_ctx = NULL;