Don't call CacheBestSize() from DoGetBestSize() implementations

This is unnecessary, wxWindow::GetBestSize() already does this, so calling it
from DoGetBestSize() called by it too is just useless.
This commit is contained in:
Vadim Zeitlin
2016-04-03 17:46:44 +02:00
parent c1cd1e01b5
commit 25c9b032a8
36 changed files with 23 additions and 97 deletions

View File

@@ -584,15 +584,9 @@ wxStaticBitmapBase::~wxStaticBitmapBase()
wxSize wxStaticBitmapBase::DoGetBestSize() const
{
wxSize best;
wxBitmap bmp = GetBitmap();
if ( bmp.IsOk() )
best = bmp.GetScaledSize();
else
// this is completely arbitrary
best = wxSize(16, 16);
CacheBestSize(best);
return best;
// the fall back size is completely arbitrary
const wxBitmap bmp = GetBitmap();
return bmp.IsOk() ? bmp.GetScaledSize() : wxSize(16, 16);
}
#endif // wxUSE_STATBMP