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

more use of wxOVERRIDE

Browse Source
This commit is contained in:
Paul Cornett
2015-09-06 17:20:42 -07:00
parent 4177593aef
commit 27a8d28029
131 changed files with 1059 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/generic/statbmpg.h
View File

@@ -35,16 +35,16 @@ public:
long style = 0,
const wxString& name = wxStaticBitmapNameStr);
virtual void SetBitmap(const wxBitmap& bitmap)
virtual void SetBitmap(const wxBitmap& bitmap) wxOVERRIDE
{
m_bitmap = bitmap;
SetInitialSize(GetBitmapSize());
Refresh();
}
virtual wxBitmap GetBitmap() const { return m_bitmap; }
virtual wxBitmap GetBitmap() const wxOVERRIDE { return m_bitmap; }
virtual void SetIcon(const wxIcon& icon)
virtual void SetIcon(const wxIcon& icon) wxOVERRIDE
{
m_bitmap.CopyFromIcon(icon);
SetInitialSize(GetBitmapSize());
@@ -53,7 +53,7 @@ public:
#if defined(__WXGTK20__) || defined(__WXMAC__)
// icons and bitmaps are really the same thing in wxGTK and wxMac
wxIcon GetIcon() const { return (const wxIcon &)m_bitmap; }
wxIcon GetIcon() const wxOVERRIDE { return (const wxIcon &)m_bitmap; }
#endif