No changes, just don't initialize the variable twice.
Remove the inactive code probably copy-and-pasted from somewhere else. Closes #14924. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -949,13 +949,11 @@ wxSize wxRibbonToolBar::GetBestSizeForParentSize(const wxSize& parentSize) const
|
|||||||
|
|
||||||
// Choose row count with largest possible area
|
// Choose row count with largest possible area
|
||||||
wxSize size = parentSize;
|
wxSize size = parentSize;
|
||||||
wxOrientation major_axis = m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL ?
|
|
||||||
wxVERTICAL : wxHORIZONTAL;
|
|
||||||
|
|
||||||
// A toolbar should maximize its width whether vertical or horizontal, so
|
// A toolbar should maximize its width whether vertical or horizontal, so
|
||||||
// force the major axis to be horizontal. Without this, there will be
|
// force the major axis to be horizontal. Without this, there will be
|
||||||
// redundant horizontal space.
|
// redundant horizontal space.
|
||||||
major_axis = wxHORIZONTAL;
|
wxOrientation major_axis = wxHORIZONTAL;
|
||||||
wxSize bestSize = m_sizes[0];
|
wxSize bestSize = m_sizes[0];
|
||||||
|
|
||||||
if(m_nrows_max != m_nrows_min)
|
if(m_nrows_max != m_nrows_min)
|
||||||
|
Reference in New Issue
Block a user