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

use wxOVERRIDE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-03-30 00:02:23 +00:00
parent ddd7ce624a
commit 8b4ae731d3
460 changed files with 4103 additions and 4107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/univ/statbmp.h
View File

@@ -52,16 +52,16 @@ public:
long style = 0,
const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap(const wxBitmap& bitmap);
virtual void SetIcon(const wxIcon& icon);
virtual wxBitmap GetBitmap() const { return m_bitmap; }
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE;
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE;
virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; }
wxIcon GetIcon() const;
wxIcon GetIcon() const wxOVERRIDE;
virtual bool HasTransparentBackground() { return true; }
virtual bool HasTransparentBackground() wxOVERRIDE { return true; }
protected:
virtual void DoDraw(wxControlRenderer *renderer);
virtual void DoDraw(wxControlRenderer *renderer) wxOVERRIDE;
private:
// the bitmap which we show