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

diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index c64b60a99763137db3777262ee8e533e0fb551e9..fa64dcc7f9700fe599c5a596f9929a12669f0e8f 100644 (file)
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -949,13 +949,11 @@ wxSize wxRibbonToolBar::GetBestSizeForParentSize(const wxSize& parentSize) const
 
     // Choose row count with largest possible area
     wxSize size = parentSize;
 
     // Choose row count with largest possible area
     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
     // force the major axis to be horizontal. Without this, there will be
     // redundant horizontal space.
 
     // A toolbar should maximize its width whether vertical or horizontal, so
     // force the major axis to be horizontal. Without this, there will be
     // redundant horizontal space.

-    major_axis = wxHORIZONTAL;
+    wxOrientation major_axis = wxHORIZONTAL;

     wxSize bestSize = m_sizes[0];
 
     if(m_nrows_max != m_nrows_min)
     wxSize bestSize = m_sizes[0];
 
     if(m_nrows_max != m_nrows_min)