wxSizerItem& m_item;
const int m_propOld;
- DECLARE_NO_COPY_CLASS(wxPropChanger)
+ wxDECLARE_NO_COPY_CLASS(wxPropChanger);
};
} // anonymous namespace
// wxWrapSizer implementation
// ============================================================================
-IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer);
+IMPLEMENT_DYNAMIC_CLASS(wxWrapSizer, wxBoxSizer)
wxWrapSizer::wxWrapSizer(int orient, int flags)
: wxBoxSizer(orient),
row->GetChildren().clear();
wxPropChanger * const
- propChanger = wx_static_cast(wxPropChanger *, item->GetUserData());
+ propChanger = static_cast<wxPropChanger *>(item->GetUserData());
if ( propChanger )
{
// this deletes propChanger and so restores the old proportion
wxSizerItem *item = node->GetData();
if ( item->IsShown() )
{
- sz = item->GetMinSize();
+ sz = item->GetMinSizeWithBorder();
if ( line->m_width+SizeInMajorDir(sz)>lineSize )
{
line = new wxWrapLine;
// 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;
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 )