From: Jaakko Salli Date: Mon, 9 Mar 2009 18:33:41 +0000 (+0000) Subject: Minor wxPGMultiButton refacotring X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f9bd155875906923912265bfa0042fd4199d116c Minor wxPGMultiButton refacotring git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 2080439da9..ca489e0740 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -1877,11 +1877,10 @@ void wxPGMultiButton::Add( const wxBitmap& bitmap, int id ) { id = GenId(id); wxSize sz = GetSize(); - wxButton* button = new wxBitmapButton( this, id, bitmap, wxPoint(sz.x, 0), wxSize(sz.y, sz.y) ); - m_buttons.push_back(button); - int bw = button->GetSize().x; - SetSize(wxSize(sz.x+bw,sz.y)); - m_buttonsWidth += bw; + wxButton* button = new wxBitmapButton( this, id, bitmap, + wxPoint(sz.x, 0), + wxSize(sz.y, sz.y) ); + DoAddButton( button, sz ); } #endif @@ -1889,7 +1888,14 @@ void wxPGMultiButton::Add( const wxString& label, int id ) { id = GenId(id); 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); int bw = button->GetSize().x; SetSize(wxSize(sz.x+bw,sz.y));