X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..9485b24f43766ad97ba1b77a70c7c1f2a40184a6:/src/common/wrapsizer.cpp diff --git a/src/common/wrapsizer.cpp b/src/common/wrapsizer.cpp index 9cb3285cb9..adca07fc18 100644 --- a/src/common/wrapsizer.cpp +++ b/src/common/wrapsizer.cpp @@ -425,7 +425,7 @@ void wxWrapSizer::CalcMinFromMinor(int totMinor) wxSizerItem *item = node->GetData(); if ( item->IsShown() ) { - sz = item->GetMinSize(); + sz = item->GetMinSizeWithBorder(); if ( line->m_width+SizeInMajorDir(sz)>lineSize ) { line = new wxWrapLine; @@ -458,7 +458,7 @@ void wxWrapSizer::CalcMinFromMinor(int totMinor) // Take what is not used on this line, see how much extension we get // by adding first item on next line. int size = lineSize-lines[ix]->m_width; // Left over at end of this line - int extSize = GetSizeInMajorDir(lines[ix+1]->m_first->GetMinSize()) - size; + int extSize = GetSizeInMajorDir(lines[ix+1]->m_first->GetMinSizeWithBorder()) - size; if ( (extSize>=tailSize && (extSize<bestExtSize || bestExtSize<tailSize)) || (extSize>bestExtSize && bestExtSize<tailSize) ) bestExtSize = extSize; @@ -527,7 +527,7 @@ void wxWrapSizer::RecalcSizes() if ( !item->IsShown() ) continue; - wxSize minItemSize = item->GetMinSize(); + wxSize minItemSize = item->GetMinSizeWithBorder(); const int itemMajor = SizeInMajorDir(minItemSize); const int itemMinor = SizeInMinorDir(minItemSize); if ( itemMajor > 0 && itemMajor < m_minItemMajor )