m_proportion = 0;
m_border = 0;
m_flag = 0;
-
- m_kind = Item_None;
+ m_id = wxID_NONE;
}
// window item
-void wxSizerItem::SetWindow(wxWindow *window)
+void wxSizerItem::DoSetWindow(wxWindow *window)
{
wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") );
int flag,
int border,
wxObject* userData)
- : m_proportion(proportion),
+ : m_kind(Item_None),
+ m_proportion(proportion),
m_border(border),
m_flag(flag),
+ m_id(wxID_NONE),
m_userData(userData)
{
- SetWindow(window);
+ DoSetWindow(window);
}
// sizer item
-void wxSizerItem::SetSizer(wxSizer *sizer)
+void wxSizerItem::DoSetSizer(wxSizer *sizer)
{
m_kind = Item_Sizer;
m_sizer = sizer;
int flag,
int border,
wxObject* userData)
- : m_proportion(proportion),
+ : m_kind(Item_None),
+ m_sizer(NULL),
+ m_proportion(proportion),
m_border(border),
m_flag(flag),
+ m_id(wxID_NONE),
m_ratio(0.0),
m_userData(userData)
{
- SetSizer(sizer);
+ DoSetSizer(sizer);
// m_minSize is set later
}
// spacer item
-void wxSizerItem::SetSpacer(const wxSize& size)
+void wxSizerItem::DoSetSpacer(const wxSize& size)
{
m_kind = Item_Spacer;
m_spacer = new wxSizerSpacer(size);
int flag,
int border,
wxObject* userData)
- : m_minSize(width, height), // minimal size is the initial size
+ : m_kind(Item_None),
+ m_sizer(NULL),
+ m_minSize(width, height), // minimal size is the initial size
m_proportion(proportion),
m_border(border),
m_flag(flag),
+ m_id(wxID_NONE),
m_userData(userData)
{
- SetSpacer(width, height);
+ DoSetSpacer(wxSize(width, height));
}
wxSizerItem::~wxSizerItem()
{
delete m_userData;
+ Free();
+}
+void wxSizerItem::Free()
+{
switch ( m_kind )
{
case Item_None:
default:
wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
}
+
+ m_kind = Item_None;
}
wxSize wxSizerItem::GetSpacer() const
if ( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this );
+ if ( item->GetSizer() )
+ item->GetSizer()->SetContainingWindow( m_containingWindow );
+
return item;
}
wxCHECK_MSG( node, false, _T("Failed to find child node") );
- wxSizerItem *item = node->GetData();
-
- if ( item->IsWindow() )
- item->GetWindow()->SetContainingSizer( NULL );
-
- delete item;
+ delete node->GetData();
m_children.Erase( node );
+
return true;
}
if (item->GetWindow() == window)
{
- item->GetWindow()->SetContainingSizer( NULL );
delete item;
m_children.Erase( node );
return true;
if ( item->IsSizer() )
item->DetachSizer();
- else if ( item->IsWindow() )
- item->GetWindow()->SetContainingSizer( NULL );
delete item;
m_children.Erase( node );
if (item->GetWindow() == oldwin)
{
- item->GetWindow()->SetContainingSizer( NULL );
- item->SetWindow(newwin);
+ item->AssignWindow(newwin);
newwin->SetContainingSizer( this );
return true;
}
if (item->GetSizer() == oldsz)
{
- wxSizer *old = item->GetSizer();
- item->SetSizer(newsz);
- delete old;
+ item->AssignSizer(newsz);
return true;
}
else if (recursive && item->IsSizer())
return m_children.Item( index )->GetData();
}
+wxSizerItem* wxSizer::GetItemById( int id, bool recursive )
+{
+ // This gets a sizer item by the id of the sizer item
+ // and NOT the id of a window if the item is a window.
+
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxSizerItem *item = node->GetData();
+
+ if (item->GetId() == id)
+ {
+ return item;
+ }
+ else if (recursive && item->IsSizer())
+ {
+ wxSizerItem *subitem = item->GetSizer()->GetItemById( id, true );
+ if (subitem)
+ return subitem;
+ }
+
+ node = node->GetNext();
+ }
+
+ return NULL;
+}
+
bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
{
wxSizerItem *item = GetItem( window, recursive );
void wxFlexGridSizer::RecalcSizes()
{
- int nitems, nrows, ncols;
- if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+ int nrows, ncols;
+ if ( !CalcRowsCols(nrows, ncols) )
return;
- wxPoint pt( GetPosition() );
- wxSize sz( GetSize() );
+ const wxPoint pt(GetPosition());
+ const wxSize sz(GetSize());
- AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
+ AdjustForGrowables(sz);
- sz = wxSize( pt.x + sz.x, pt.y + sz.y );
+ wxSizerItemList::const_iterator i = m_children.begin();
+ const wxSizerItemList::const_iterator end = m_children.end();
- int x = pt.x;
- for (int c = 0; c < ncols; c++)
+ int y = 0;
+ for ( int r = 0; r < nrows; r++ )
{
- int y = pt.y;
- for (int r = 0; r < nrows; r++)
+ if ( m_rowHeights[r] == -1 )
{
- int i = r * ncols + c;
- if (i < nitems)
+ // this row is entirely hidden, skip it
+ for ( int c = 0; c < ncols; c++ )
{
- wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+ if ( i == end )
+ return;
- wxASSERT_MSG( node, _T("Failed to find node") );
+ ++i;
+ }
- int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) );
- int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) );
+ continue;
+ }
- SetItemBounds( node->GetData(), x, y, w, h);
- }
- if (m_rowHeights[r] != -1)
- y = y + m_rowHeights[r] + m_vgap;
+ const int hrow = m_rowHeights[r];
+ int h = sz.y - y; // max remaining height, don't overflow it
+ if ( hrow < h )
+ h = hrow;
+
+ int x = 0;
+ for ( int c = 0; c < ncols && i != end; c++, ++i )
+ {
+ const int wcol = m_colWidths[c];
+
+ if ( wcol == -1 )
+ continue;
+
+ int w = sz.x - x; // max possible value, ensure we don't overflow
+ if ( wcol < w )
+ w = wcol;
+
+ SetItemBounds(*i, pt.x + x, pt.y + y, w, h);
+
+ x += wcol + m_hgap;
+ }
+
+ if ( i == end )
+ return;
+
+ y += hrow + m_vgap;
+ }
+}
+
+// helper function used in CalcMin() to sum up the sizes of non-hidden items
+static int SumArraySizes(const wxArrayInt& sizes, int gap)
+{
+ // Sum total minimum size, including gaps between rows/columns.
+ // -1 is used as a magic number meaning empty row/column.
+ int total = 0;
+
+ const size_t count = sizes.size();
+ for ( size_t n = 0; n < count; n++ )
+ {
+ if ( sizes[n] != -1 )
+ {
+ if ( total )
+ total += gap; // separate from the previous column
+
+ total += sizes[n];
}
- if (m_colWidths[c] != -1)
- x = x + m_colWidths[c] + m_hgap;
}
+
+ return total;
}
wxSize wxFlexGridSizer::CalcMin()
{
- int nrows,
- ncols;
- size_t i, s;
+ int nrows,
+ ncols;
// Number of rows/columns can change as items are added or removed.
if ( !CalcRowsCols(nrows, ncols) )
return wxSize();
- m_rowHeights.SetCount(nrows);
- m_colWidths.SetCount(ncols);
- // We have to recalcuate the sizes in case the item minimum size has
+ // We have to recalculate the sizes in case the item minimum size has
// changed since the previous layout, or the item has been hidden using
// wxSizer::Show(). If all the items in a row/column are hidden, the final
// dimension of the row/column will be -1, indicating that the column
// itself is hidden.
- for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i )
- m_rowHeights[ i ] = -1;
- for( s = m_colWidths.GetCount(), i = 0; i < s; ++i )
- m_colWidths[ i ] = -1;
-
- wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
-
- i = 0;
- while (node)
+ m_rowHeights.assign(nrows, -1);
+ m_colWidths.assign(ncols, -1);
+
+ // n is the index of the item in left-to-right top-to-bottom order
+ size_t n = 0;
+ for ( wxSizerItemList::iterator i = m_children.begin();
+ i != m_children.end();
+ ++i, ++n )
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem * const item = *i;
if ( item->IsShown() )
{
- wxSize sz( item->CalcMin() );
- int row = i / ncols;
- int col = i % ncols;
+ const wxSize sz(item->CalcMin());
- m_rowHeights[ row ] = wxMax( wxMax( 0, sz.y ), m_rowHeights[ row ] );
- m_colWidths[ col ] = wxMax( wxMax( 0, sz.x ), m_colWidths[ col ] );
- }
+ const int row = n / ncols;
+ const int col = n % ncols;
- node = node->GetNext();
- i++;
+ if ( sz.y > m_rowHeights[row] )
+ m_rowHeights[row] = sz.y;
+ if ( sz.x > m_colWidths[col] )
+ m_colWidths[col] = sz.x;
+ }
}
AdjustForFlexDirection();
- // Sum total minimum size, including gaps between rows/columns.
- // -1 is used as a magic number meaning empty column.
- int width = 0;
- for (int col = 0; col < ncols; col++)
- if ( m_colWidths[ col ] != -1 )
- width += m_colWidths[ col ] + m_hgap;
- if (width > 0)
- width -= m_hgap;
-
- int height = 0;
- for (int row = 0; row < nrows; row++)
- if ( m_rowHeights[ row ] != -1 )
- height += m_rowHeights[ row ] + m_vgap;
- if (height > 0)
- height -= m_vgap;
-
- m_calculatedMinSize = wxSize( width, height );
+ m_calculatedMinSize = wxSize(SumArraySizes(m_colWidths, m_hgap),
+ SumArraySizes(m_rowHeights, m_vgap));
+
return m_calculatedMinSize;
}
// and now fill it with the largest value
for ( n = 0; n < count; ++n )
{
- array[n] = largest;
+ // don't touch hidden rows
+ if ( array[n] != -1 )
+ array[n] = largest;
}
}
}
-
-void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
- int nrows, int ncols)
+// helper of AdjustForGrowables() which is called for rows/columns separately
+//
+// parameters:
+// delta: the extra space, we do nothing unless it's positive
+// growable: indices or growable rows/cols in sizes array
+// sizes: the height/widths of rows/cols to adjust
+// proportions: proportions of the growable rows/cols or NULL if they all
+// should be assumed to have proportion of 1
+static void
+DoAdjustForGrowables(int delta,
+ const wxArrayInt& growable,
+ wxArrayInt& sizes,
+ const wxArrayInt *proportions)
{
- // what to do with the rows? by default, resize them proportionally
- if ( sz.y > minsz.y && ( (m_flexDirection & wxVERTICAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
- {
- int sum_proportions = 0;
- int growable_space = 0;
- int num = 0;
- size_t idx;
- for (idx = 0; idx < m_growableRows.GetCount(); idx++)
- {
- // Since the number of rows/columns can change as items are
- // inserted/deleted, we need to verify at runtime that the
- // requested growable rows/columns are still valid.
- if (m_growableRows[idx] >= nrows)
- continue;
+ if ( delta <= 0 )
+ return;
- // If all items in a row/column are hidden, that row/column will
- // have a dimension of -1. This causes the row/column to be
- // hidden completely.
- if (m_rowHeights[ m_growableRows[idx] ] == -1)
- continue;
- sum_proportions += m_growableRowsProportions[idx];
- growable_space += m_rowHeights[ m_growableRows[idx] ];
- num++;
- }
+ // total sum of proportions of all non-hidden rows
+ int sum_proportions = 0;
- if (num > 0)
- {
- for (idx = 0; idx < m_growableRows.GetCount(); idx++)
- {
- if (m_growableRows[idx] >= nrows )
- continue;
- if (m_rowHeights[ m_growableRows[idx] ] == -1)
- m_rowHeights[ m_growableRows[idx] ] = 0;
- else
- {
- int delta = (sz.y - minsz.y);
- if (sum_proportions == 0)
- delta = (delta/num) + m_rowHeights[ m_growableRows[idx] ];
- else
- delta = ((delta+growable_space)*m_growableRowsProportions[idx]) / sum_proportions;
- m_rowHeights[ m_growableRows[idx] ] = delta;
- }
- }
- }
- }
- else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
+ // number of currently shown growable rows
+ int num = 0;
+
+ const int max_idx = sizes.size();
+
+ const size_t count = growable.size();
+ size_t idx;
+ for ( idx = 0; idx < count; idx++ )
{
- // rounding problem?
- for ( int row = 0; row < nrows; ++row )
- m_rowHeights[ row ] = sz.y / nrows;
+ // Since the number of rows/columns can change as items are
+ // inserted/deleted, we need to verify at runtime that the
+ // requested growable rows/columns are still valid.
+ if ( growable[idx] >= max_idx )
+ continue;
+
+ // If all items in a row/column are hidden, that row/column will
+ // have a dimension of -1. This causes the row/column to be
+ // hidden completely.
+ if ( sizes[growable[idx]] == -1 )
+ continue;
+
+ if ( proportions )
+ sum_proportions += (*proportions)[idx];
+
+ num++;
}
- // the same logic as above but for the columns
- if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+ if ( !num )
+ return;
+
+ // the remaining extra free space, adjusted during each iteration
+ for ( idx = 0; idx < count; idx++ )
{
- int sum_proportions = 0;
- int growable_space = 0;
- int num = 0;
- size_t idx;
- for (idx = 0; idx < m_growableCols.GetCount(); idx++)
- {
- // Since the number of rows/columns can change as items are
- // inserted/deleted, we need to verify at runtime that the
- // requested growable rows/columns are still valid.
- if (m_growableCols[idx] >= ncols)
- continue;
+ if ( growable[idx] >= max_idx )
+ continue;
- // If all items in a row/column are hidden, that row/column will
- // have a dimension of -1. This causes the column to be hidden
- // completely.
- if (m_colWidths[ m_growableCols[idx] ] == -1)
- continue;
- sum_proportions += m_growableColsProportions[idx];
- growable_space += m_colWidths[ m_growableCols[idx] ];
- num++;
- }
+ if ( sizes[ growable[idx] ] == -1 )
+ continue;
- if (num > 0)
+ int cur_delta;
+ if ( sum_proportions == 0 )
{
- for (idx = 0; idx < m_growableCols.GetCount(); idx++)
- {
- if (m_growableCols[idx] >= ncols )
- continue;
- if (m_colWidths[ m_growableCols[idx] ] == -1)
- m_colWidths[ m_growableCols[idx] ] = 0;
- else
- {
- int delta = (sz.x - minsz.x);
- if (sum_proportions == 0)
- delta = (delta/num) + m_colWidths[ m_growableCols[idx] ];
- else
- delta = ((delta+growable_space)*m_growableColsProportions[idx])/sum_proportions;
- m_colWidths[ m_growableCols[idx] ] = delta;
- }
- }
+ // no growable rows -- divide extra space evenly among all
+ cur_delta = delta/num;
+ num--;
}
+ else // allocate extra space proportionally
+ {
+ const int cur_prop = (*proportions)[idx];
+ cur_delta = (delta*cur_prop)/sum_proportions;
+ sum_proportions -= cur_prop;
+ }
+
+ sizes[growable[idx]] += cur_delta;
+ delta -= cur_delta;
+ }
+}
+
+void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
+{
+ if ( (m_flexDirection & wxVERTICAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
+ {
+ // pass NULL instead of proportions if the grow mode is ALL as we
+ // should treat all rows as having proportion of 1 then
+ DoAdjustForGrowables
+ (
+ sz.y - m_calculatedMinSize.y,
+ m_growableRows,
+ m_rowHeights,
+ m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableRowsProportions
+ : NULL
+ );
}
- else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
+
+ if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
{
- for ( int col=0; col < ncols; ++col )
- m_colWidths[ col ] = sz.x / ncols;
+ DoAdjustForGrowables
+ (
+ sz.x - m_calculatedMinSize.x,
+ m_growableCols,
+ m_colWidths,
+ m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions
+ : NULL
+ );
}
}
// wxBoxSizer
//---------------------------------------------------------------------------
-wxBoxSizer::wxBoxSizer( int orient )
- : m_orient( orient )
-{
-}
-
void wxBoxSizer::RecalcSizes()
{
- if (m_children.GetCount() == 0)
+ if ( m_children.empty() )
return;
- int delta = 0;
- if (m_stretchable)
- {
- if (m_orient == wxHORIZONTAL)
- delta = m_size.x - m_fixedWidth;
- else
- delta = m_size.y - m_fixedHeight;
- }
+ // the amount of free space which we should redistribute among the
+ // stretchable items (i.e. those with non zero proportion)
+ int delta = SizeInMajorDir(m_size) - SizeInMajorDir(m_minSize);
- wxPoint pt( m_position );
+ // the position at which we put the next child
+ wxPoint pt(m_position);
- wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
- while (node)
+ const wxCoord totalMinorSize = SizeInMinorDir(m_size);
+
+ int totalProportion = m_totalProportion;
+ for ( wxSizerItemList::const_iterator i = m_children.begin();
+ i != m_children.end();
+ ++i )
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem * const item = *i;
- if (item->IsShown())
- {
- wxSize size( item->GetMinSizeWithBorder() );
+ if ( !item->IsShown() )
+ continue;
- if (m_orient == wxVERTICAL)
- {
- wxCoord height = size.y;
- if (item->GetProportion())
- {
- // Because of at least one visible item has non-zero
- // proportion then m_stretchable is not zero
- height = (delta * item->GetProportion()) / m_stretchable;
- }
+ const wxSize sizeThis(item->GetMinSizeWithBorder());
- wxPoint child_pos( pt );
- wxSize child_size( size.x, height );
- if (item->GetFlag() & (wxEXPAND | wxSHAPED))
- child_size.x = m_size.x;
- else if (item->GetFlag() & wxALIGN_RIGHT)
- child_pos.x += m_size.x - size.x;
- else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL))
- // XXX wxCENTER is added for backward compatibility;
- // wxALIGN_CENTER should be used in new code
- child_pos.x += (m_size.x - size.x) / 2;
+ // adjust the size in the major direction using the proportion
+ wxCoord majorSize = SizeInMajorDir(sizeThis);
+ const int propItem = item->GetProportion();
+ if ( propItem )
+ {
+ const int deltaItem = (delta * propItem) / totalProportion;
- item->SetDimension( child_pos, child_size );
+ majorSize += deltaItem;
- pt.y += height;
- }
- else
- {
- wxCoord width = size.x;
- if (item->GetProportion())
- {
- // Because of at least one visible item has non-zero
- // proportion then m_stretchable is not zero
- width = (delta * item->GetProportion()) / m_stretchable;
- }
+ delta -= deltaItem;
+ totalProportion -= propItem;
+ }
- wxPoint child_pos( pt );
- wxSize child_size( width, size.y );
- if (item->GetFlag() & (wxEXPAND | wxSHAPED))
- child_size.y = m_size.y;
- else if (item->GetFlag() & wxALIGN_BOTTOM)
- child_pos.y += m_size.y - size.y;
- else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL))
- // XXX wxCENTER is added for backward compatibility;
- // wxALIGN_CENTER should be used in new code
- child_pos.y += (m_size.y - size.y) / 2;
+ // apply the alignment in the minor direction
+ wxPoint posChild(pt);
- if ( m_containingWindow )
- {
- child_pos.x = m_containingWindow->AdjustForLayoutDirection
- (
- child_pos.x,
- width,
- m_size.x
- );
- }
+ wxCoord minorSize = SizeInMinorDir(sizeThis);
+ const int flag = item->GetFlag();
+ if ( flag & (wxEXPAND | wxSHAPED) )
+ {
+ minorSize = totalMinorSize;
+ }
+ else if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) )
+ {
+ PosInMinorDir(posChild) += totalMinorSize - minorSize;
+ }
+ // NB: wxCENTRE is used here only for backwards compatibility,
+ // wxALIGN_CENTRE should be used in new code
+ else if ( flag & (wxCENTER | wxALIGN_CENTRE) )
+ {
+ PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2;
+ }
- item->SetDimension( child_pos, child_size );
- pt.x += width;
- }
+ // apply RTL adjustment for horizontal sizers:
+ if ( !IsVertical() && m_containingWindow )
+ {
+ posChild.x = m_containingWindow->AdjustForLayoutDirection
+ (
+ posChild.x,
+ majorSize,
+ m_size.x
+ );
}
- node = node->GetNext();
+ // finally set size of this child and advance to the next one
+ item->SetDimension(posChild, SizeFromMajorMinor(majorSize, minorSize));
+
+ PosInMajorDir(pt) += majorSize;
}
}
wxSize wxBoxSizer::CalcMin()
{
- if (m_children.GetCount() == 0)
- return wxSize();
-
- m_stretchable = 0;
- m_minWidth = 0;
- m_minHeight = 0;
- m_fixedWidth = 0;
- m_fixedHeight = 0;
+ m_totalProportion = 0;
+ m_minSize = wxSize(0, 0);
- // precalc item minsizes and count proportions
- wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
- while (node)
+ // calculate the minimal sizes for all items and count sum of proportions
+ for ( wxSizerItemList::const_iterator i = m_children.begin();
+ i != m_children.end();
+ ++i )
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem * const item = *i;
- if ( item->IsShown() )
- {
- item->CalcMin(); // result is stored in the item
-
- m_stretchable += item->GetProportion();
- }
-
- node = node->GetNext();
- }
-
- // Total minimum size (width or height) of sizer
- int maxMinSize = 0;
-
- node = m_children.GetFirst();
- while (node)
- {
- wxSizerItem *item = node->GetData();
-
- if (item->IsShown() && item->GetProportion() != 0)
- {
- int stretch = item->GetProportion();
- wxSize size( item->GetMinSizeWithBorder() );
- int minSize;
-
- // Integer division rounded up is (a + b - 1) / b
- // Round up needed in order to guarantee that all
- // all items will have size not less then their min size
- if (m_orient == wxHORIZONTAL)
- minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
- else
- minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
-
- if (minSize > maxMinSize)
- maxMinSize = minSize;
- }
- node = node->GetNext();
- }
+ if ( !item->IsShown() )
+ continue;
- // Calculate overall minimum size
- node = m_children.GetFirst();
- while (node)
- {
- wxSizerItem *item = node->GetData();
+ const wxSize sizeMinThis = item->CalcMin();
- if (item->IsShown())
- {
- wxSize size( item->GetMinSizeWithBorder() );
- if (item->GetProportion() != 0)
- {
- if (m_orient == wxHORIZONTAL)
- size.x = (maxMinSize*item->GetProportion())/m_stretchable;
- else
- size.y = (maxMinSize*item->GetProportion())/m_stretchable;
- }
- else
- {
- if (m_orient == wxVERTICAL)
- {
- m_fixedHeight += size.y;
- m_fixedWidth = wxMax( m_fixedWidth, size.x );
- }
- else
- {
- m_fixedWidth += size.x;
- m_fixedHeight = wxMax( m_fixedHeight, size.y );
- }
- }
+ SizeInMajorDir(m_minSize) += SizeInMajorDir(sizeMinThis);
+ if ( SizeInMinorDir(sizeMinThis) > SizeInMinorDir(m_minSize) )
+ SizeInMinorDir(m_minSize) = SizeInMinorDir(sizeMinThis);
- if (m_orient == wxHORIZONTAL)
- {
- m_minWidth += size.x;
- m_minHeight = wxMax( m_minHeight, size.y );
- }
- else
- {
- m_minHeight += size.y;
- m_minWidth = wxMax( m_minWidth, size.x );
- }
- }
- node = node->GetNext();
+ m_totalProportion += item->GetProportion();
}
- return wxSize( m_minWidth, m_minHeight );
+ return m_minSize;
}
//---------------------------------------------------------------------------
m_buttonNegative = mybutton;
break;
case wxID_CANCEL:
+ case wxID_CLOSE:
m_buttonCancel = mybutton;
break;
case wxID_HELP:
if (m_buttonAffirmative->GetId() == wxID_SAVE){
// these buttons have set labels under Mac so we should use them
m_buttonAffirmative->SetLabel(_("Save"));
- m_buttonNegative->SetLabel(_("Don't Save"));
+ if (m_buttonNegative)
+ m_buttonNegative->SetLabel(_("Don't Save"));
}
}
Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
}
+ // according to HIG, in explicit apply windows the order is:
+ // [ Help Apply Cancel OK ]
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
if (m_buttonCancel){
Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
// Cancel or help should be default
// m_buttonCancel->SetDefaultButton();
}
- if (m_buttonApply)
- Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
-
if (m_buttonAffirmative)
Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
#elif defined(__WXMSW__)
projects / wxWidgets.git / blobdiff