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

Don't make wxToolBarToolBase::Set{Normal,Disabled}Bitmap() virtual.

Browse Source 
There is no need for this, these methods are not supposed to be overridden as
they are only ever called by wxToolBar itself and making them virtual just
confused things.

See #16985.
This commit is contained in:
Vadim Zeitlin
2015-05-12 17:04:59 +02:00
parent bc3f5503db
commit ea406d2f3a
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/tbarbase.h
View File

@@ -177,8 +177,8 @@ public:
void Toggle() { Toggle(!IsToggled()); } void Toggle() { Toggle(!IsToggled()); }
virtual void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; } void SetNormalBitmap(const wxBitmap& bmp) { m_bmpNormal = bmp; }
virtual void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; } void SetDisabledBitmap(const wxBitmap& bmp) { m_bmpDisabled = bmp; }
virtual void SetLabel(const wxString& label) { m_label = label; } virtual void SetLabel(const wxString& label) { m_label = label; }

6
src/osx/carbon/toolbar.cpp
View File

@@ -195,12 +195,6 @@ public:
return true; return true;
} }
virtual void SetNormalBitmap(const wxBitmap& bmp)
{
wxToolBarToolBase::SetNormalBitmap(bmp);
UpdateToggleImage(CanBeToggled() && IsToggled());
}
virtual void SetLabel(const wxString& label) virtual void SetLabel(const wxString& label)
{ {
wxToolBarToolBase::SetLabel(label); wxToolBarToolBase::SetLabel(label);