Move wxStaticBitmapBase methods to the appropriate file

For some reason, wxStaticBitmapBase methods were defined in the wrong
ctrlcmn.cpp file rather than statbmpcmn.cpp. Just move them there to
avoid confusion.

No real changes.

This commit is best viewed with --color-moved git option.
This commit is contained in:
Vadim Zeitlin 2021-10-21 00:33:22 +01:00
parent 9326aa3b6c
commit 1d6e3e3693
2 changed files with 16 additions and 20 deletions

View File

@ -620,24 +620,4 @@ wxString wxControlBase::Ellipsize(const wxString& label, const wxDC& dc,
return ret;
}
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
#if wxUSE_STATBMP
wxStaticBitmapBase::~wxStaticBitmapBase()
{
// this destructor is required for Darwin
}
wxSize wxStaticBitmapBase::DoGetBestSize() const
{
// the fall back size is completely arbitrary
const wxBitmap bmp = GetBitmap();
return bmp.IsOk() ? bmp.GetScaledSize() : wxSize(16, 16);
}
#endif // wxUSE_STATBMP
#endif // wxUSE_CONTROLS

View File

@ -80,4 +80,20 @@ wxCONSTRUCTOR_5( wxStaticBitmap, wxWindow*, Parent, wxWindowID, Id, \
bitmap
*/
// ----------------------------------------------------------------------------
// wxStaticBitmap
// ----------------------------------------------------------------------------
wxStaticBitmapBase::~wxStaticBitmapBase()
{
// this destructor is required for Darwin
}
wxSize wxStaticBitmapBase::DoGetBestSize() const
{
// the fall back size is completely arbitrary
const wxBitmap bmp = GetBitmap();
return bmp.IsOk() ? bmp.GetScaledSize() : wxSize(16, 16);
}
#endif // wxUSE_STATBMP