From 38c67b68e34b4f534d9a3c83fd6839b404a8416e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 6 Dec 2017 14:46:26 +0100 Subject: [PATCH] Remove unnecessary "virtual" keywords from Cairo code Several methods were virtual for no apparent reason, just don't make them virtual unnecessarily. No real changes. --- src/generic/graphicc.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 02f460e6af..69c407acd3 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -291,7 +291,7 @@ public: void Init(); virtual void Apply( wxGraphicsContext* context ) wxOVERRIDE; - virtual wxDouble GetWidth() { return m_width; } + wxDouble GetWidth() { return m_width; } private : double m_width; @@ -320,7 +320,7 @@ public: const wxGraphicsGradientStops& stops); protected: - virtual void Init(); + void Init(); // common part of Create{Linear,Radial}GradientBrush() void AddGradientStops(const wxGraphicsGradientStops& stops); @@ -337,7 +337,7 @@ public: const wxColour& col); ~wxCairoFontData(); - virtual void Apply( wxGraphicsContext* context ); + void Apply( wxGraphicsContext* context ); #ifdef __WXGTK__ const wxFont& GetFont() const { return m_wxfont; } #endif @@ -383,10 +383,10 @@ public: wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surface_t* bitmap ); ~wxCairoBitmapData(); - virtual cairo_surface_t* GetCairoSurface() { return m_surface; } - virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; } - virtual void* GetNativeBitmap() const wxOVERRIDE { return m_surface; } - virtual wxSize GetSize() { return wxSize(m_width, m_height); } + cairo_surface_t* GetCairoSurface() { return m_surface; } + cairo_pattern_t* GetCairoPattern() { return m_pattern; } + void* GetNativeBitmap() const wxOVERRIDE { return m_surface; } + wxSize GetSize() { return wxSize(m_width, m_height); } #if wxUSE_IMAGE wxImage ConvertToImage() const;