fixed previous revision: call wxControl's, not wxButton's DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c6fbe2f0c8
commit
e0aeebed0a
@ -68,6 +68,7 @@ public:
|
||||
|
||||
protected:
|
||||
virtual void OnSetBitmap();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
void Init();
|
||||
|
||||
|
@ -68,6 +68,7 @@ public:
|
||||
|
||||
protected:
|
||||
virtual void OnSetBitmap();
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
void Init();
|
||||
|
||||
|
@ -263,6 +263,11 @@ void wxBitmapButton::OnSetBitmap()
|
||||
}
|
||||
}
|
||||
|
||||
wxSize wxBitmapButton::DoGetBestSize() const
|
||||
{
|
||||
return wxControl::DoGetBestSize();
|
||||
}
|
||||
|
||||
bool wxBitmapButton::Enable( bool enable )
|
||||
{
|
||||
if ( !wxWindow::Enable(enable) )
|
||||
|
@ -263,6 +263,11 @@ void wxBitmapButton::OnSetBitmap()
|
||||
}
|
||||
}
|
||||
|
||||
wxSize wxBitmapButton::DoGetBestSize() const
|
||||
{
|
||||
return wxControl::DoGetBestSize();
|
||||
}
|
||||
|
||||
bool wxBitmapButton::Enable( bool enable )
|
||||
{
|
||||
if ( !wxWindow::Enable(enable) )
|
||||
|
Loading…
Reference in New Issue
Block a user