Don't crash in wxAuiToolBar::GetToolBarFits().

The code could crash if m_overflowVisible was true but m_overflowSizerItem was
NULL. Ideally this shouldn't happen in the first place, but it did, so at
least fix the crash for now -- and hopefully this code will be refactored to
make it more clear later.

Closes #15747.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-12-18 16:18:57 +00:00
parent fba8b37345
commit 0cf0dfae6b

View File

@@ -1772,7 +1772,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const
if (m_orientation == wxVERTICAL)
{
// take the dropdown size into account
if (m_overflowVisible)
if (m_overflowVisible && m_overflowSizerItem)
cli_h -= m_overflowSizerItem->GetSize().y;
if (rect.y+rect.height < cli_h)
@@ -1781,7 +1781,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const
else
{
// take the dropdown size into account
if (m_overflowVisible)
if (m_overflowVisible && m_overflowSizerItem)
cli_w -= m_overflowSizerItem->GetSize().x;
if (rect.x+rect.width < cli_w)