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:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user