// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "sizer.h"
#endif
#include "wx/sizer.h"
#include "wx/utils.h"
#include "wx/statbox.h"
-#include "wx/notebook.h"
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
+#if WXWIN_COMPATIBILITY_2_4
+ #include "wx/notebook.h"
+#endif
+
+#ifdef __WXMAC__
+# include "wx/mac/uma.h"
+#endif
//---------------------------------------------------------------------------
#if wxUSE_STATBOX
IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
#endif
-#if wxUSE_NOTEBOOK
-IMPLEMENT_CLASS(wxNotebookSizer, wxSizer)
-#endif
WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
+/*
+ TODO PROPERTIES
+ sizeritem
+ object
+ object_ref
+ minsize
+ option
+ flag
+ border
+ spacer
+ option
+ flag
+ borfder
+ boxsizer
+ orient
+ staticboxsizer
+ orient
+ label
+ gridsizer
+ rows
+ cols
+ vgap
+ hgap
+ flexgridsizer
+ rows
+ cols
+ vgap
+ hgap
+ growablerows
+ growablecols
+ minsize
+*/
//---------------------------------------------------------------------------
// wxSizerItem
//---------------------------------------------------------------------------
+void wxSizerItem::Init()
+{
+ m_window = NULL;
+ m_sizer = NULL;
+ m_show = true;
+ m_userData = NULL;
+}
+
+void wxSizerItem::Init(const wxSizerFlags& flags)
+{
+ Init();
+
+ m_proportion = flags.GetProportion();
+ m_flag = flags.GetFlags();
+ m_border = flags.GetBorderInPixels();
+}
+
wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData )
: m_window( NULL )
, m_sizer( NULL )
wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
: m_window( window )
, m_sizer( NULL )
- , m_minSize( window->GetSize() ) // minimal size is the initial size
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_show( true )
, m_userData( userData )
{
+ if (flag & wxFIXED_MINSIZE)
+ window->SetMinSize(window->GetSize());
+ m_minSize = window->GetSize();
+
// aspect ratio calculated from initial size
SetRatio( m_minSize );
// m_size is calculated later
}
+wxSizerItem::wxSizerItem()
+{
+ Init();
+
+ m_proportion = 0;
+ m_border = 0;
+ m_flag = 0;
+}
+
wxSizerItem::~wxSizerItem()
{
- if (m_userData)
- delete m_userData;
- if (m_sizer)
+ delete m_userData;
+
+ if ( m_window )
+ {
+ m_window->SetContainingSizer(NULL);
+ }
+ else // we must be a sizer
+ {
delete m_sizer;
+ }
}
wxSize wxSizerItem::CalcMin()
{
- wxSize ret;
if (IsSizer())
{
- ret = m_sizer->GetMinSize();
+ m_minSize = m_sizer->GetMinSize();
// if we have to preserve aspect ratio _AND_ this is
// the first-time calculation, consider ret to be initial size
if ((m_flag & wxSHAPED) && !m_ratio)
- SetRatio(ret);
+ SetRatio(m_minSize);
}
- else
+ else if ( IsWindow() )
{
- if ( IsWindow() && (m_flag & wxADJUST_MINSIZE) )
- {
- // By user request, keep the minimal size for this item
- // in sync with the largest of BestSize and any user supplied
- // minimum size hint. Useful in cases where the item is
- // changeable -- static text labels, etc.
- m_minSize = m_window->GetAdjustedBestSize();
- }
-
- ret = m_minSize;
+ // Since the size of the window may change during runtime, we
+ // should use the current minimal/best size.
+ m_minSize = m_window->GetBestFittingSize();
}
+ return GetMinSizeWithBorder();
+}
+
+wxSize wxSizerItem::GetMinSizeWithBorder() const
+{
+ wxSize ret = m_minSize;
+
if (m_flag & wxWEST)
ret.x += m_border;
if (m_flag & wxEAST)
return ret;
}
+
void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
if (m_flag & wxSHAPED)
void wxSizerItem::DeleteWindows()
{
if (m_window)
+ {
m_window->Destroy();
+ m_window = NULL;
+ }
if (m_sizer)
m_sizer->DeleteWindows();
wxSizer::wxSizer()
: m_minSize( wxSize( 0, 0 ) )
{
- m_children.DeleteContents( true );
}
wxSizer::~wxSizer()
{
- Clear();
-}
-
-void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( window, proportion, flag, border, userData ) );
- window->SetContainingSizer( this );
-}
-
-void wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Add( wxSizerItem *item )
-{
- m_children.Append( item );
-
- if( item->GetWindow() )
- item->GetWindow()->SetContainingSizer( this );
-}
-
-void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) );
- window->SetContainingSizer( this );
-}
-
-void wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Insert( new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData )
-{
- m_children.Insert( new wxSizerItem( width, height, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Prepend( wxSizerItem *item )
-{
- m_children.Insert( item );
-
- if( item->GetWindow() )
- item->GetWindow()->SetContainingSizer( this );
-}
-
-void wxSizer::Insert( size_t index,
- wxWindow *window,
- int proportion,
- int flag,
- int border,
- wxObject* userData )
-{
- m_children.Insert( index,
- new wxSizerItem( window, proportion, flag, border, userData ) );
- window->SetContainingSizer( this );
-}
-
-void wxSizer::Insert( size_t index,
- wxSizer *sizer,
- int proportion,
- int flag,
- int border,
- wxObject* userData )
-{
- m_children.Insert( index,
- new wxSizerItem( sizer, proportion, flag, border, userData ) );
-}
-
-void wxSizer::Insert( size_t index,
- int width,
- int height,
- int proportion,
- int flag,
- int border,
- wxObject* userData )
-{
- m_children.Insert( index,
- new wxSizerItem( width, height, proportion, flag, border, userData ) );
+ WX_CLEAR_LIST(wxSizerItemList, m_children);
}
void wxSizer::Insert( size_t index, wxSizerItem *item )
{
wxASSERT_MSG( sizer, _T("Removing NULL sizer") );
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetSizer() == sizer)
- return m_children.DeleteNode( node );
+ {
+ delete item;
+ m_children.Erase( node );
+ return true;
+ }
node = node->GetNext();
}
false,
_T("Remove index is out of range") );
- wxSizerItemList::Node *node = m_children.Item( index );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( index );
wxCHECK_MSG( node, false, _T("Failed to find child node") );
if( item->IsWindow() )
item->GetWindow()->SetContainingSizer( NULL );
- return m_children.DeleteNode( node );
+ delete item;
+ m_children.Erase( node );
+ return true;
}
bool wxSizer::Detach( wxSizer *sizer )
{
wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetSizer() == sizer)
{
item->DetachSizer();
- return m_children.DeleteNode( node );
+ delete item;
+ m_children.Erase( node );
+ return true;
}
node = node->GetNext();
}
{
wxASSERT_MSG( window, _T("Detaching NULL window") );
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetWindow() == window)
{
item->GetWindow()->SetContainingSizer( NULL );
- return m_children.DeleteNode( node );
+ delete item;
+ m_children.Erase( node );
+ return true;
}
node = node->GetNext();
}
false,
_T("Detach index is out of range") );
- wxSizerItemList::Node *node = m_children.Item( index );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( index );
wxCHECK_MSG( node, false, _T("Failed to find child node") );
else if( item->IsWindow() )
item->GetWindow()->SetContainingSizer( NULL );
- return m_children.DeleteNode( node );
+ delete item;
+ m_children.Erase( node );
+ return true;
}
void wxSizer::Clear( bool delete_windows )
{
// First clear the ContainingSizer pointers
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
DeleteWindows();
// Now empty the list
- m_children.Clear();
+ WX_CLEAR_LIST(wxSizerItemList, m_children);
}
void wxSizer::DeleteWindows()
{
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
wxSize wxSizer::Fit( wxWindow *window )
{
- wxSize size;
- if (window->IsTopLevel())
- size = FitSize( window );
- else
- size = GetMinWindowSize( window );
+ wxSize size(window->IsTopLevel() ? FitSize(window)
+ : GetMinWindowSize(window));
window->SetSize( size );
void wxSizer::Layout()
{
+ // (re)calculates minimums needed for each item and other preparations
+ // for layout
CalcMin();
+
+ // Applies the layout and repositions/resizes the items
RecalcSizes();
}
minSize.y+size.y-client_size.y );
}
+// TODO on mac we need a function that determines how much free space this
+// min size contains, in order to make sure that we have 20 pixels of free
+// space around the controls
+
// Return a window size that will fit within the screens dimensions
wxSize wxSizer::FitSize( wxWindow *window )
{
// Limit the size if sizeMax != wxDefaultSize
- if ( size.x > sizeMax.x && sizeMax.x != -1 )
+ if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
size.x = sizeMax.x;
- if ( size.y > sizeMax.y && sizeMax.y != -1 )
+ if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
size.y = sizeMax.y;
return size;
// Limit the size if sizeMax != wxDefaultSize
- if ( size.x > sizeMax.x && sizeMax.x != -1 )
+ if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
size.x = sizeMax.x;
- if ( size.y > sizeMax.y && sizeMax.y != -1 )
+ if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
size.y = sizeMax.y;
return size;
// Is it our immediate child?
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetWindow() == window)
{
- item->SetInitSize( width, height );
+ item->SetMinSize( width, height );
return true;
}
node = node->GetNext();
// Is it our immediate child?
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
{
- wxSizerItemList::Node *node = m_children.Item( index );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( index );
wxCHECK_MSG( node, false, _T("Failed to find child node") );
}
else
{
- // ... but the minimal size of spacers and windows in stored in them
- item->SetInitSize( width, height );
+ // ... but the minimal size of spacers and windows is stored via the item
+ item->SetMinSize( width, height );
}
return true;
}
-void wxSizer::Show( wxWindow *window, bool show )
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
{
wxASSERT_MSG( window, _T("Show for NULL window") );
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetWindow() == window)
{
item->Show( show );
- break;
+
+ return true;
+ }
+ else if (recursive && item->IsSizer())
+ {
+ if (item->GetSizer()->Show(window, show, recursive))
+ return true;
}
+
node = node->GetNext();
}
+
+ return false;
}
-void wxSizer::Show( wxSizer *sizer, bool show )
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
{
wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetSizer() == sizer)
{
item->Show( show );
- break;
+
+ return true;
}
+ else if (recursive && item->IsSizer())
+ {
+ if (item->GetSizer()->Show(sizer, show, recursive))
+ return true;
+ }
+
node = node->GetNext();
}
+
+ return false;
}
-void wxSizer::Show( size_t index, bool show )
+bool wxSizer::Show( size_t index, bool show)
{
- wxCHECK_RET( index < m_children.GetCount(),
+ wxCHECK_MSG( index < m_children.GetCount(),
+ false,
_T("Show index is out of range") );
m_children.Item( index )->GetData()->Show( show );
+
+ return true;
}
void wxSizer::ShowItems( bool show )
{
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
node->GetData()->Show( show );
bool wxSizer::IsShown( wxWindow *window ) const
{
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
bool wxSizer::IsShown( wxSizer *sizer ) const
{
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
, m_vgap( vgap )
, m_hgap( hgap )
{
+ if (m_rows == 0 && m_cols == 0)
+ m_rows = 1;
}
wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
, m_vgap( vgap )
, m_hgap( hgap )
{
+ if (m_rows == 0 && m_cols == 0)
+ m_rows = 1;
}
int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
int i = r * ncols + c;
if (i < nitems)
{
- wxSizerItemList::Node *node = m_children.Item( i );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( i );
wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
wxSize wxGridSizer::CalcMin()
{
- int nitems, nrows, ncols;
- if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+ int nrows, ncols;
+ if ( CalcRowsCols(nrows, ncols) == 0 )
return wxSize(10, 10);
// Find the max width and height for any component
int w = 0;
int h = 0;
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
{
wxPoint pt( x,y );
- wxSize sz( item->CalcMin() );
+ wxSize sz( item->GetMinSizeWithBorder() );
int flag = item->GetFlag();
if ((flag & wxEXPAND) || (flag & wxSHAPED))
if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
return;
- wxSize sz( GetSize() );
- wxSize minsz( CalcMin() );
wxPoint pt( GetPosition() );
+ wxSize sz( GetSize() );
- // 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 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++;
- }
-
- 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) )
- {
- // rounding problem?
- for ( int row = 0; row < nrows; ++row )
- m_rowHeights[ row ] = sz.y / nrows;
- }
-
- // the same logic as above but for the columns
- if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
- {
- 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 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];
- // wtb 5/12/02 bugfix - was m_ColWidths[idx]!!
- growable_space += m_colWidths[ m_growableCols[idx] ];
- num++;
- }
-
- if (num > 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;
- }
- }
- }
- }
- else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
- {
- for ( int col=0; col < ncols; ++col )
- m_colWidths[ col ] = sz.x / ncols;
- }
+ AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
sz = wxSize( pt.x + sz.x, pt.y + sz.y );
int i = r * ncols + c;
if (i < nitems)
{
- wxSizerItemList::Node *node = m_children.Item( i );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( i );
wxASSERT_MSG( node, _T("Failed to find node") );
m_rowHeights.SetCount(nrows);
m_colWidths.SetCount(ncols);
- // We have to recalcuate the sizes in case an item has wxADJUST_MINSIZE, has changed
- // minimum size since the previous layout, or 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.
+ // We have to recalcuate 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::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
i = 0;
while (node)
i++;
}
- // the logic above works when we resize flexibly in both directions but
- // maybe this is not the case
+ 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 ] + ( col == ncols-1 ? 0 : m_hgap );
+
+ int height = 0;
+ for (int row = 0; row < nrows; row++)
+ if ( m_rowHeights[ row ] != -1 )
+ height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
+
+ m_calculatedMinSize = wxSize( width, height );
+ return m_calculatedMinSize;
+}
+
+void wxFlexGridSizer::AdjustForFlexDirection()
+{
+ // the logic in CalcMin works when we resize flexibly in both directions
+ // but maybe this is not the case
if ( m_flexDirection != wxBOTH )
{
// select the array corresponding to the direction in which we do *not*
array[n] = largest;
}
}
+}
- // 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 ] + ( col == ncols-1 ? 0 : m_hgap );
- int height = 0;
- for (int row = 0; row < nrows; row++)
- if ( m_rowHeights[ row ] != -1 )
- height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
+void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
+ int nrows, int ncols)
+{
+ // 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 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++;
+ }
+
+ 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) )
+ {
+ // rounding problem?
+ for ( int row = 0; row < nrows; ++row )
+ m_rowHeights[ row ] = sz.y / nrows;
+ }
- return wxSize( width, height );
+ // the same logic as above but for the columns
+ if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+ {
+ 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 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 (num > 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;
+ }
+ }
+ }
+ }
+ else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
+ {
+ for ( int col=0; col < ncols; ++col )
+ m_colWidths[ col ] = sz.x / ncols;
+ }
}
+
void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
{
m_growableRows.Add( idx );
m_growableRowsProportions.Add( proportion );
}
-void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) )
+void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
{
+ m_growableRows.Remove( idx );
}
void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
m_growableColsProportions.Add( proportion );
}
-void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) )
+void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
{
+ m_growableCols.Remove( idx );
}
//---------------------------------------------------------------------------
return;
int delta = 0;
- int extra = 0;
if (m_stretchable)
{
if (m_orient == wxHORIZONTAL)
- {
- delta = (m_size.x - m_fixedWidth) / m_stretchable;
- extra = (m_size.x - m_fixedWidth) % m_stretchable;
- }
+ delta = m_size.x - m_fixedWidth;
else
- {
- delta = (m_size.y - m_fixedHeight) / m_stretchable;
- extra = (m_size.y - m_fixedHeight) % m_stretchable;
- }
+ delta = m_size.y - m_fixedHeight;
}
wxPoint pt( m_position );
- wxSizerItemList::Node *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->IsShown())
{
- int weight = 1;
- if (item->GetProportion())
- weight = item->GetProportion();
-
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
if (m_orient == wxVERTICAL)
{
wxCoord height = size.y;
if (item->GetProportion())
{
- height = (delta * weight) + extra;
- extra = 0; // only the first item will get the remainder as extra size
+ // Because of at least one visible item has non-zero
+ // proportion then m_stretchable is not zero
+ height = (delta * item->GetProportion()) / m_stretchable;
}
wxPoint child_pos( pt );
wxCoord width = size.x;
if (item->GetProportion())
{
- width = (delta * weight) + extra;
- extra = 0; // only the first item will get the remainder as extra size
+ // Because of at least one visible item has non-zero
+ // proportion then m_stretchable is not zero
+ width = (delta * item->GetProportion()) / m_stretchable;
}
wxPoint child_pos( pt );
m_fixedWidth = 0;
m_fixedHeight = 0;
- // Find how long each stretch unit needs to be
- int stretchSize = 1;
- wxSizerItemList::Node *node = m_children.GetFirst();
+ // precalc item minsizes and count proportions
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxSizerItem *item = node->GetData();
+
+ if (item->IsShown())
+ item->CalcMin(); // result is stored in the item
+
+ if (item->IsShown() && item->GetProportion() != 0)
+ 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();
+ wxSizerItem *item = node->GetData();
if (item->IsShown() && item->GetProportion() != 0)
{
int stretch = item->GetProportion();
- wxSize size( item->CalcMin() );
- int sizePerStretch;
+ 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)
- sizePerStretch = ( size.x + stretch - 1 ) / stretch;
+ minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
else
- sizePerStretch = ( size.y + stretch - 1 ) / stretch;
- if (sizePerStretch > stretchSize)
- stretchSize = sizePerStretch;
+ minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
+
+ if (minSize > maxMinSize)
+ maxMinSize = minSize;
}
node = node->GetNext();
}
node = m_children.GetFirst();
while (node)
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem *item = node->GetData();
if (item->IsShown())
{
- m_stretchable += item->GetProportion();
-
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
if (item->GetProportion() != 0)
{
if (m_orient == wxHORIZONTAL)
- size.x = stretchSize * item->GetProportion();
+ size.x = (maxMinSize*item->GetProportion())/m_stretchable;
else
- size.y = stretchSize * item->GetProportion();
- }
-
- if (m_orient == wxHORIZONTAL)
- {
- m_minWidth += size.x;
- m_minHeight = wxMax( m_minHeight, size.y );
+ size.y = (maxMinSize*item->GetProportion())/m_stretchable;
}
else
- {
- m_minHeight += size.y;
- m_minWidth = wxMax( m_minWidth, size.x );
- }
-
- if (item->GetProportion() == 0)
{
if (m_orient == wxVERTICAL)
{
m_fixedHeight = wxMax( m_fixedHeight, size.y );
}
}
+
+ 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();
}
// guess the thickness of a wxStaticBox border
#ifdef __WXCOCOA__
box->GetBordersForSizer(borderTop,borderOther);
-#else // __WXCOCOA__
+#elif defined(__WXMAC__)
+
+ static int extraTop = -1; // Uninitted
+ static int other = 5;
+
+ if ( extraTop == -1 )
+ {
+ // The minimal border used for the top. Later on the staticbox'
+ // font height is added to this.
+ extraTop = 0;
+
+ if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ )
+ {
+ // As indicated by the HIG, Panther needs an extra border of 11
+ // pixels (otherwise overlapping occurs at the top). The "other"
+ // border has to be 11.
+ extraTop = 11;
+ other = 11;
+ }
+
+ }
+
+ *borderTop = extraTop + box->GetCharHeight();
+ *borderOther = other;
+
+#else
#ifdef __WXGTK__
if ( box->GetLabel().IsEmpty() )
*borderTop = 5;
return ret;
}
+void wxStaticBoxSizer::ShowItems( bool show )
+{
+ m_staticBox->Show( show );
+ wxBoxSizer::ShowItems( show );
+}
+
#endif // wxUSE_STATBOX
-//---------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
// wxNotebookSizer
-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
#if wxUSE_NOTEBOOK
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+
+#if wxUSE_BOOKCTRL
-wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
- : m_notebook( nb )
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
+ : m_bookctrl(bookctrl)
{
- wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
+ wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );
}
-void wxNotebookSizer::RecalcSizes()
+void wxBookCtrlSizer::RecalcSizes()
{
- m_notebook->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+ m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
}
-wxSize wxNotebookSizer::CalcMin()
+wxSize wxBookCtrlSizer::CalcMin()
{
- wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0));
+ wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0));
sizeBorder.x += 5;
sizeBorder.y += 5;
- if (m_notebook->GetChildren().GetCount() == 0)
+ if ( m_bookctrl->GetPageCount() == 0 )
{
return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
}
int maxX = 0;
int maxY = 0;
- wxWindowList::Node *node = m_notebook->GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator
+ node = m_bookctrl->GetChildren().GetFirst();
while (node)
{
wxWindow *item = node->GetData();
return wxSize( maxX, maxY ) + sizeBorder;
}
-#endif // wxUSE_NOTEBOOK
+#if wxUSE_NOTEBOOK
+
+wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
+{
+ wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+ m_bookctrl = nb;
+}
+
+#endif // wxUSE_NOTEBOOOK
+#endif // wxUSE_BOOKCTRL
-// vi:sts=4:sw=4:et
+#endif // WXWIN_COMPATIBILITY_2_4
projects / wxWidgets.git / blobdiff