Fixed some warnings

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

diff --git a/src/ribbon/toolbar.cpp b/src/ribbon/toolbar.cpp
index 6c6c8b7f5a527af6ad55919c7073111da08ad7ca..fa64dcc7f9700fe599c5a596f9929a12669f0e8f 100644 (file)
--- a/src/ribbon/toolbar.cpp
+++ b/src/ribbon/toolbar.cpp
@@ -949,14 +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;

-    int row_count = m_nrows_max;
-    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)


@@ -968,7 +965,6 @@ wxSize wxRibbonToolBar::GetBestSizeForParentSize(const wxSize& parentSize) const
                 GetSizeInOrientation(m_sizes[i], major_axis) > area)
             {
                 area = GetSizeInOrientation(m_sizes[i], major_axis);
                 GetSizeInOrientation(m_sizes[i], major_axis) > area)
             {
                 area = GetSizeInOrientation(m_sizes[i], major_axis);

-                row_count = m_nrows_min + i;

                 bestSize = m_sizes[i];
             }
         }
                 bestSize = m_sizes[i];
             }
         }


@@ -1151,6 +1147,8 @@ void wxRibbonToolBar::OnMouseUp(wxMouseEvent& WXUNUSED(evt))
             notification.SetEventObject(this);
             notification.SetBar(this);
             ProcessEvent(notification);
             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
         }
 
         // Notice that m_active_tool could have been reset by the event handler