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

Minor wxPGMultiButton refacotring

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2009-03-09 18:33:41 +00:00
parent 6086bcc8ba
commit f9bd155875
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/propgrid/editors.cpp
View File

@@ -1877,11 +1877,10 @@ void wxPGMultiButton::Add( const wxBitmap& bitmap, int id )
{ {
id = GenId(id); id = GenId(id);
wxSize sz = GetSize(); wxSize sz = GetSize();
wxButton* button = new wxBitmapButton( this, id, bitmap, wxPoint(sz.x, 0), wxSize(sz.y, sz.y) ); wxButton* button = new wxBitmapButton( this, id, bitmap,
m_buttons.push_back(button); wxPoint(sz.x, 0),
int bw = button->GetSize().x; wxSize(sz.y, sz.y) );
SetSize(wxSize(sz.x+bw,sz.y)); DoAddButton( button, sz );
m_buttonsWidth += bw;
} }
#endif #endif
@@ -1889,7 +1888,14 @@ void wxPGMultiButton::Add( const wxString& label, int id )
{ {
id = GenId(id); id = GenId(id);
wxSize sz = GetSize(); wxSize sz = GetSize();
wxButton* button = new wxButton( this, id, label, wxPoint(sz.x, 0), wxSize(sz.y, sz.y) ); wxButton* button = new wxButton( this, id, label, wxPoint(sz.x, 0),
wxSize(sz.y, sz.y) );
DoAddButton( button, sz );
}
void wxPGMultiButton::DoAddButton( wxWindow* button,
const wxSize& sz )
{
m_buttons.push_back(button); m_buttons.push_back(button);
int bw = button->GetSize().x; int bw = button->GetSize().x;
SetSize(wxSize(sz.x+bw,sz.y)); SetSize(wxSize(sz.x+bw,sz.y));