Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mark virtual overrides as virtual

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-05-17 15:46:26 +00:00
parent f069ac4801
commit f2c757c5cc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/graphicc.cpp
View File

@@ -335,7 +335,7 @@ public:
virtual cairo_surface_t* GetCairoSurface() { return m_surface; } virtual cairo_surface_t* GetCairoSurface() { return m_surface; }
virtual cairo_pattern_t* GetCairoPattern() { return m_pattern; } 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); } virtual wxSize GetSize() { return wxSize(m_width, m_height); }
#if wxUSE_IMAGE #if wxUSE_IMAGE

2
src/msw/graphics.cpp
View File

@@ -280,7 +280,7 @@ public:
~wxGDIPlusBitmapData (); ~wxGDIPlusBitmapData ();
virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; } virtual Bitmap* GetGDIPlusBitmap() { return m_bitmap; }
void* GetNativeBitmap() const { return (void*)m_bitmap; } virtual void* GetNativeBitmap() const { return m_bitmap; }
#if wxUSE_IMAGE #if wxUSE_IMAGE
wxImage ConvertToImage() const; wxImage ConvertToImage() const;

2
src/osx/carbon/graphics.cpp
View File

@@ -976,7 +976,7 @@ public:
~wxMacCoreGraphicsBitmapData(); ~wxMacCoreGraphicsBitmapData();
virtual CGImageRef GetBitmap() { return m_bitmap; } 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; } bool IsMonochrome() { return m_monochrome; }
#if wxUSE_IMAGE #if wxUSE_IMAGE