Fix the use of obsolete wxDD_NEW_DIR_BUTTON in wxOSX.

[wxWidgets.git] / src / ribbon / toolbar.cpp

diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 6c6c8b7f5a527af6ad55919c7073111da08ad7ca..c64b60a99763137db3777262ee8e533e0fb551e9 100644 (file)
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -949,7 +949,6 @@ wxSize wxRibbonToolBar::GetBestSizeForParentSize(const wxSize& parentSize) const
 
     // Choose row count with largest possible area
     wxSize size = parentSize;
-    int row_count = m_nrows_max;
     wxOrientation major_axis = m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL ?
         wxVERTICAL : wxHORIZONTAL;
 
@@ -968,7 +967,6 @@ wxSize wxRibbonToolBar::GetBestSizeForParentSize(const wxSize& parentSize) const
                 GetSizeInOrientation(m_sizes[i], major_axis) > area)
             {
                 area = GetSizeInOrientation(m_sizes[i], major_axis);
-                row_count = m_nrows_min + i;
                 bestSize = m_sizes[i];
             }
         }
@@ -1151,6 +1149,8 @@ void wxRibbonToolBar::OnMouseUp(wxMouseEvent& WXUNUSED(evt))
             notification.SetEventObject(this);
             notification.SetBar(this);
             ProcessEvent(notification);
+
+            wxStaticCast(m_parent, wxRibbonPanel)->HideIfExpanded();
         }
 
         // Notice that m_active_tool could have been reset by the event handler