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

wxBitmapButton doesn't need own DoGetBestSize, wxControl's one works (fixes sizing bug)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-10-18 12:38:21 +00:00
parent b1ad1424b9
commit b2b4469be1
4 changed files with 0 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/gtk/bmpbuttn.h
View File

@@ -68,7 +68,6 @@ public:
protected: protected:
virtual void OnSetBitmap(); virtual void OnSetBitmap();
virtual wxSize DoGetBestSize() const;
void Init(); void Init();

1
include/wx/gtk1/bmpbuttn.h
View File

@@ -68,7 +68,6 @@ public:
protected: protected:
virtual void OnSetBitmap(); virtual void OnSetBitmap();
virtual wxSize DoGetBestSize() const;
void Init(); void Init();

14
src/gtk/bmpbuttn.cpp
View File

@@ -263,20 +263,6 @@ void wxBitmapButton::OnSetBitmap()
} }
} }
wxSize wxBitmapButton::DoGetBestSize() const
{
wxSize best;
if (m_bmpNormal.Ok())
{
int border = HasFlag(wxNO_BORDER) ? 4 : 10;
best.x = m_bmpNormal.GetWidth()+border;
best.y = m_bmpNormal.GetHeight()+border;
}
CacheBestSize(best);
return best;
}
bool wxBitmapButton::Enable( bool enable ) bool wxBitmapButton::Enable( bool enable )
{ {
if ( !wxWindow::Enable(enable) ) if ( !wxWindow::Enable(enable) )

14
src/gtk1/bmpbuttn.cpp
View File

@@ -263,20 +263,6 @@ void wxBitmapButton::OnSetBitmap()
} }
} }
wxSize wxBitmapButton::DoGetBestSize() const
{
wxSize best;
if (m_bmpNormal.Ok())
{
int border = HasFlag(wxNO_BORDER) ? 4 : 10;
best.x = m_bmpNormal.GetWidth()+border;
best.y = m_bmpNormal.GetHeight()+border;
}
CacheBestSize(best);
return best;
}
bool wxBitmapButton::Enable( bool enable ) bool wxBitmapButton::Enable( bool enable )
{ {
if ( !wxWindow::Enable(enable) ) if ( !wxWindow::Enable(enable) )