From f2c757c5cc31459c1f8adfd321a9cf9fcd429f53 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Thu, 17 May 2012 15:46:26 +0000 Subject: [PATCH] mark virtual overrides as virtual git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/graphicc.cpp | 2 +- src/msw/graphics.cpp | 2 +- src/osx/carbon/graphics.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 04bb3432bf..ca611d155f 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -335,7 +335,7 @@ public: virtual cairo_surface_t* GetCairoSurface() { return m_surface; } virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; } - void* GetNativeBitmap() const { return (void*)m_surface; } + virtual void* GetNativeBitmap() const { return m_surface; } virtual wxSize GetSize() { return wxSize(m_width, m_height); } #if wxUSE_IMAGE diff --git a/src/msw/graphics.cpp b/src/msw/graphics.cpp index dd6ff85899..54f0c33e67 100644 --- a/src/msw/graphics.cpp +++ b/src/msw/graphics.cpp @@ -280,7 +280,7 @@ public: ~wxGDIPlusBitmapData (); virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; } - void* GetNativeBitmap() const { return (void*)m_bitmap; } + virtual void* GetNativeBitmap() const { return m_bitmap; } #if wxUSE_IMAGE wxImage ConvertToImage() const; diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 59350b04dd..d4871e718f 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -976,7 +976,7 @@ public: ~wxMacCoreGraphicsBitmapData(); virtual CGImageRef GetBitmap() { return m_bitmap; } - void* GetNativeBitmap() const { return (void*)m_bitmap; } + virtual void* GetNativeBitmap() const { return m_bitmap; } bool IsMonochrome() { return m_monochrome; } #if wxUSE_IMAGE -- 2.45.2