X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96fdbb60f1d25a1f77b011c432b71ee152c15ed7..878711c01c1b9ad5b97d35f379a048b8ce1bfb49:/src/common/sizer.cpp diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 79da84f99d..21f311e59b 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -1,11 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: sizer.cpp // Purpose: provide new wxSizer class for layout -// Author: Robert Roebling and Robin Dunn +// Author: Robert Roebling and Robin Dunn, contributions by +// Dirk Holtwick, Ron Lee // Modified by: Ron Lee // Created: // RCS-ID: $Id$ -// Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling +// Copyright: (c) Robin Dunn, Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -24,47 +25,51 @@ #include "wx/utils.h" #include "wx/statbox.h" #include "wx/notebook.h" +#include //--------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject) -IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject) -IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer) -IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer) -IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer) +IMPLEMENT_CLASS(wxSizerItem, wxObject) +IMPLEMENT_CLASS(wxSizer, wxObject) +IMPLEMENT_CLASS(wxGridSizer, wxSizer) +IMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer) +IMPLEMENT_CLASS(wxBoxSizer, wxSizer) #if wxUSE_STATBOX -IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer) +IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer) #endif #if wxUSE_NOTEBOOK -IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer) +IMPLEMENT_CLASS(wxNotebookSizer, wxSizer) #endif +WX_DEFINE_EXPORTED_LIST( wxSizerItemList ); + + //--------------------------------------------------------------------------- // wxSizerItem //--------------------------------------------------------------------------- -wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData ) - : m_window( 0 ) - , m_sizer( 0 ) +wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int border, wxObject* userData ) + : m_window( NULL ) + , m_sizer( NULL ) , m_size( wxSize( width, height ) ) // size is set directly , m_minSize( m_size ) // minimal size is the initial size - , m_option( option ) + , m_proportion( proportion ) , m_border( border ) , m_flag( flag ) - , m_show( TRUE ) // Cannot be changed + , m_show( true ) , m_userData( userData ) { SetRatio( m_size ); } -wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData ) +wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) : m_window( window ) - , m_sizer( 0 ) + , m_sizer( NULL ) , m_minSize( window->GetSize() ) // minimal size is the initial size - , m_option( option ) + , m_proportion( proportion ) , m_border( border ) , m_flag( flag ) - , m_show( TRUE ) + , m_show( true ) , m_userData( userData ) { // aspect ratio calculated from initial size @@ -73,14 +78,14 @@ wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wx // m_size is calculated later } -wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) - : m_window( 0 ) +wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) + : m_window( NULL ) , m_sizer( sizer ) - , m_option( option ) + , m_proportion( proportion ) , m_border( border ) , m_flag( flag ) - , m_show( TRUE ) - , m_ratio( 0 ) + , m_show( true ) + , m_ratio( 0.0 ) , m_userData( userData ) { // m_minSize is calculated later @@ -96,7 +101,7 @@ wxSizerItem::~wxSizerItem() } -wxSize wxSizerItem::GetSize() +wxSize wxSizerItem::GetSize() const { wxSize ret; if (IsSizer()) @@ -227,30 +232,52 @@ void wxSizerItem::DeleteWindows() m_sizer->DeleteWindows(); } -bool wxSizerItem::IsWindow() +bool wxSizerItem::IsWindow() const { return (m_window != NULL); } -bool wxSizerItem::IsSizer() +bool wxSizerItem::IsSizer() const { return (m_sizer != NULL); } -bool wxSizerItem::IsSpacer() +bool wxSizerItem::IsSpacer() const { return (m_window == NULL) && (m_sizer == NULL); } +void wxSizerItem::Show( bool show ) +{ + m_show = show; + + if( IsWindow() ) + m_window->Show( show ); + else if( IsSizer() ) + m_sizer->ShowItems( show ); + + // ... nothing else to do to hide/show spacers +} + +void wxSizerItem::SetOption( int option ) +{ + SetProportion( option ); +} + +int wxSizerItem::GetOption() const +{ + return GetProportion(); +} + + //--------------------------------------------------------------------------- // wxSizer //--------------------------------------------------------------------------- wxSizer::wxSizer() + : m_minSize( wxSize( 0, 0 ) ) { - m_children.DeleteContents( TRUE ); - m_minSize.x = 0; - m_minSize.y = 0; + m_children.DeleteContents( true ); } wxSizer::~wxSizer() @@ -258,148 +285,209 @@ wxSizer::~wxSizer() Clear(); } -void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData ) +void wxSizer::Add( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) { - m_children.Append( new wxSizerItem( window, option, flag, border, userData ) ); - window->SetContainingSizer(this); + m_children.Append( new wxSizerItem( window, proportion, flag, border, userData ) ); + window->SetContainingSizer( this ); } -void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +void wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) { - m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) ); + m_children.Append( new wxSizerItem( sizer, proportion, flag, border, userData ) ); } -void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData ) +void wxSizer::Add( int width, int height, int proportion, int flag, int border, wxObject* userData ) { - m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) ); + m_children.Append( new wxSizerItem( width, height, proportion, flag, border, userData ) ); } -void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData ) +void wxSizer::Add( wxSizerItem *item ) { - m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) ); - window->SetContainingSizer(this); + m_children.Append( item ); + + if( item->GetWindow() ) + item->GetWindow()->SetContainingSizer( this ); } -void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) { - m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) ); + m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) ); + window->SetContainingSizer( this ); } -void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData ) +void wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) { - m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) ); + m_children.Insert( new wxSizerItem( sizer, proportion, flag, border, userData ) ); } -void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData ) +void wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData ) { - m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) ); - window->SetContainingSizer(this); + m_children.Insert( new wxSizerItem( width, height, proportion, flag, border, userData ) ); } -void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +void wxSizer::Prepend( wxSizerItem *item ) { - m_children.Insert( before, new wxSizerItem( sizer, option, flag, border, userData ) ); + m_children.Insert( item ); + + if( item->GetWindow() ) + item->GetWindow()->SetContainingSizer( this ); } -void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData ) +void wxSizer::Insert( size_t index, + wxWindow *window, + int proportion, + int flag, + int border, + wxObject* userData ) { - m_children.Insert( before, new wxSizerItem( width, height, option, flag, border, userData ) ); + m_children.Insert( index, + new wxSizerItem( window, proportion, flag, border, userData ) ); + window->SetContainingSizer( this ); } -bool wxSizer::Remove( wxWindow *window ) +void wxSizer::Insert( size_t index, + wxSizer *sizer, + int proportion, + int flag, + int border, + wxObject* userData ) { - wxASSERT( window ); + m_children.Insert( index, + new wxSizerItem( sizer, proportion, flag, border, userData ) ); +} - wxNode *node = m_children.First(); - while (node) - { - wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetWindow() == window) - { - item->GetWindow()->SetContainingSizer(NULL); - m_children.DeleteNode( node ); - return TRUE; - } - node = node->Next(); - } +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 ) ); +} - return FALSE; +void wxSizer::Insert( size_t index, wxSizerItem *item ) +{ + m_children.Insert( index, item ); + + if( item->GetWindow() ) + item->GetWindow()->SetContainingSizer( this ); +} + +bool wxSizer::Remove( wxWindow *window ) +{ + return Detach( window ); } bool wxSizer::Remove( wxSizer *sizer ) { - wxASSERT( sizer ); + wxASSERT_MSG( sizer, _T("Removing NULL sizer") ); - wxNode *node = m_children.First(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSizerItem *item = node->GetData(); + if (item->GetSizer() == sizer) - { - m_children.DeleteNode( node ); - return TRUE; - } - node = node->Next(); + return m_children.DeleteNode( node ); + + node = node->GetNext(); } - return FALSE; + return false; } -bool wxSizer::Remove( int pos ) +bool wxSizer::Remove( int index ) { - if ((size_t)pos >= m_children.GetCount()) - return FALSE; - wxNode *node = m_children.Nth( pos ); - if (!node) return FALSE; + wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(), + false, + _T("Remove index is out of range") ); + + wxSizerItemList::Node *node = m_children.Item( index ); + + wxCHECK_MSG( node, false, _T("Failed to find child node") ); + + wxSizerItem *item = node->GetData(); - m_children.DeleteNode( node ); + if( item->IsWindow() ) + item->GetWindow()->SetContainingSizer( NULL ); - return TRUE; + return m_children.DeleteNode( node ); } bool wxSizer::Detach( wxSizer *sizer ) { - wxASSERT( sizer ); + wxASSERT_MSG( sizer, _T("Detaching NULL sizer") ); - wxNode *node = m_children.First(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSizerItem *item = node->GetData(); + if (item->GetSizer() == sizer) { item->DetachSizer(); - m_children.DeleteNode( node ); - return TRUE; + return m_children.DeleteNode( node ); + } + node = node->GetNext(); + } + + return false; +} + +bool wxSizer::Detach( wxWindow *window ) +{ + wxASSERT_MSG( window, _T("Detaching NULL window") ); + + wxSizerItemList::Node *node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetWindow() == window) + { + item->GetWindow()->SetContainingSizer( NULL ); + return m_children.DeleteNode( node ); } - node = node->Next(); + node = node->GetNext(); } - return FALSE; + return false; } -bool wxSizer::Detach( int pos ) +bool wxSizer::Detach( int index ) { - if ((size_t)pos >= m_children.GetCount()) - return FALSE; - wxNode *node = m_children.Nth( pos ); - if (!node) return FALSE; + wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(), + false, + _T("Detach index is out of range") ); + + wxSizerItemList::Node *node = m_children.Item( index ); + + wxCHECK_MSG( node, false, _T("Failed to find child node") ); - ( (wxSizerItem*)node->Data() )->DetachSizer(); - m_children.DeleteNode( node ); + wxSizerItem *item = node->GetData(); - return TRUE; + if( item->IsSizer() ) + item->DetachSizer(); + else if( item->IsWindow() ) + item->GetWindow()->SetContainingSizer( NULL ); + + return m_children.DeleteNode( node ); } void wxSizer::Clear( bool delete_windows ) { // First clear the ContainingSizer pointers - wxNode *node = m_children.First(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSizerItem *item = node->GetData(); + if (item->IsWindow()) - item->GetWindow()->SetContainingSizer(NULL); - node = node->Next(); + item->GetWindow()->SetContainingSizer( NULL ); + node = node->GetNext(); } // Destroy the windows if needed @@ -412,12 +500,13 @@ void wxSizer::Clear( bool delete_windows ) void wxSizer::DeleteWindows() { - wxNode *node = m_children.First(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSizerItem *item = node->GetData(); + item->DeleteWindows(); - node = node->Next(); + node = node->GetNext(); } } @@ -477,16 +566,17 @@ void wxSizer::SetVirtualSizeHints( wxWindow *window ) window->GetMaxHeight() ); } -wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) +wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const { return window->GetMaxSize(); } wxSize wxSizer::GetMinWindowSize( wxWindow *window ) { - wxSize minSize( GetMinSize() ); - wxSize size( window->GetSize() ); - wxSize client_size( window->GetClientSize() ); + wxSize minSize( GetMinSize() ); + wxSize size( window->GetSize() ); + wxSize client_size( window->GetClientSize() ); + return wxSize( minSize.x+size.x-client_size.x, minSize.y+size.y-client_size.y ); } @@ -507,7 +597,7 @@ wxSize wxSizer::FitSize( wxWindow *window ) return size; } -wxSize wxSizer::GetMaxClientSize( wxWindow *window ) +wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const { wxSize maxSize( window->GetMaxSize() ); @@ -568,80 +658,88 @@ void wxSizer::DoSetMinSize( int width, int height ) bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height ) { - wxASSERT( window ); + wxASSERT_MSG( window, _T("SetMinSize for NULL window") ); - wxNode *node = m_children.First(); + // Is it our immediate child? + + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSizerItem *item = node->GetData(); + if (item->GetWindow() == window) { item->SetInitSize( width, height ); - return TRUE; + return true; } - node = node->Next(); + node = node->GetNext(); } - node = m_children.First(); + // No? Search any subsizers we own then + + node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetSizer()) + wxSizerItem *item = node->GetData(); + + if ( item->GetSizer() && + item->GetSizer()->DoSetItemMinSize( window, width, height ) ) { - // It's a sizer, so lets search recursively. - if (item->GetSizer()->DoSetItemMinSize( window, width, height )) - { - // A child sizer found the requested windw, exit. - return TRUE; - } + // A child sizer found the requested windw, exit. + return true; } - node = node->Next(); + node = node->GetNext(); } - return FALSE; + return false; } bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height ) { - wxASSERT( sizer ); + wxASSERT_MSG( sizer, _T("SetMinSize for NULL sizer") ); + + // Is it our immediate child? - wxNode *node = m_children.First(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); + wxSizerItem *item = node->GetData(); + if (item->GetSizer() == sizer) { item->GetSizer()->DoSetMinSize( width, height ); - return TRUE; + return true; } - node = node->Next(); + node = node->GetNext(); } - node = m_children.First(); + // No? Search any subsizers we own then + + node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetSizer()) + wxSizerItem *item = node->GetData(); + + if ( item->GetSizer() && + item->GetSizer()->DoSetItemMinSize( sizer, width, height ) ) { - // It's a sizer, so lets search recursively. - if (item->GetSizer()->DoSetItemMinSize( sizer, width, height )) - { - // A child sizer found the requested windw, exit. - return TRUE; - } + // A child found the requested sizer, exit. + return true; } - node = node->Next(); + node = node->GetNext(); } - return FALSE; + return false; } -bool wxSizer::DoSetItemMinSize( int pos, int width, int height ) +bool wxSizer::DoSetItemMinSize( size_t index, int width, int height ) { - wxNode *node = m_children.Nth( pos ); - if (!node) return FALSE; + wxSizerItemList::Node *node = m_children.Item( index ); + + wxCHECK_MSG( node, false, _T("Failed to find child node") ); + + wxSizerItem *item = node->GetData(); - wxSizerItem *item = (wxSizerItem*) node->Data(); if (item->GetSizer()) { // Sizers contains the minimal size in them, if not calculated ... @@ -653,111 +751,129 @@ bool wxSizer::DoSetItemMinSize( int pos, int width, int height ) item->SetInitSize( width, height ); } - return TRUE; + return true; } -void wxSizer::Show(wxWindow *window, bool show) +void wxSizer::Show( wxWindow *window, bool show ) { - wxNode *node = m_children.GetFirst(); + wxASSERT_MSG( window, _T("Show for NULL window") ); + + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem *item = node->GetData(); - if (item->IsWindow() && item->GetWindow() == window) + if (item->GetWindow() == window) { - item->Show(show); - window->Show(show); - return; + item->Show( show ); + break; } - node = node->Next(); + node = node->GetNext(); } } -void wxSizer::Show(wxSizer *sizer, bool show) +void wxSizer::Show( wxSizer *sizer, bool show ) { - wxNode *node = m_children.GetFirst(); + wxASSERT_MSG( sizer, _T("Show for NULL sizer") ); + + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem *item = node->GetData(); - if (item->IsSizer() && item->GetSizer() == sizer) + if (item->GetSizer() == sizer) { - item->Show(show); - sizer->ShowItems(show); - return; + item->Show( show ); + break; } - node = node->Next(); + node = node->GetNext(); } } -void wxSizer::ShowItems (bool show) +void wxSizer::Show( size_t index, bool show ) { - wxNode *node = m_children.GetFirst(); - while (node) - { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxCHECK_RET( index < m_children.GetCount(), + _T("Show index is out of range") ); - if (item->IsWindow()) - item->GetWindow()->Show (show); - else if (item->IsSizer()) - item->GetSizer()->ShowItems (show); + m_children.Item( index )->GetData()->Show( show ); +} - node = node->Next(); +void wxSizer::ShowItems( bool show ) +{ + wxSizerItemList::Node *node = m_children.GetFirst(); + while (node) + { + node->GetData()->Show( show ); + node = node->GetNext(); } } -bool wxSizer::IsShown (wxWindow *window) +bool wxSizer::IsShown( wxWindow *window ) const { - wxNode *node = m_children.GetFirst(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); - - if (item->IsWindow() && item->GetWindow() == window) + wxSizerItem *item = node->GetData(); + + if (item->GetWindow() == window) { return item->IsShown(); } - node = node->Next(); + node = node->GetNext(); } - return FALSE; + wxFAIL_MSG( _T("IsShown failed to find sizer item") ); + + return false; } -bool wxSizer::IsShown (wxSizer *sizer) +bool wxSizer::IsShown( wxSizer *sizer ) const { - wxNode *node = m_children.GetFirst(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem *item = node->GetData(); - if (item->IsSizer() && item->GetSizer() == sizer) + if (item->GetSizer() == sizer) { return item->IsShown(); } - node = node->Next(); + node = node->GetNext(); } - return FALSE; + wxFAIL_MSG( _T("IsShown failed to find sizer item") ); + + return false; +} + +bool wxSizer::IsShown( size_t index ) const +{ + wxCHECK_MSG( index < m_children.GetCount(), + false, + _T("IsShown index is out of range") ); + + return m_children.Item( index )->GetData()->IsShown(); } + //--------------------------------------------------------------------------- // wxGridSizer //--------------------------------------------------------------------------- wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) + : m_rows( rows ) + , m_cols( cols ) + , m_vgap( vgap ) + , m_hgap( hgap ) { - m_rows = rows; - m_cols = cols; - m_vgap = vgap; - m_hgap = hgap; } wxGridSizer::wxGridSizer( int cols, int vgap, int hgap ) + : m_rows( 0 ) + , m_cols( cols ) + , m_vgap( vgap ) + , m_hgap( hgap ) { - m_rows = 0; - m_cols = cols; - m_vgap = vgap; - m_hgap = hgap; } int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const @@ -807,10 +923,11 @@ void wxGridSizer::RecalcSizes() int i = r * ncols + c; if (i < nitems) { - wxNode *node = m_children.Nth( i ); - wxASSERT( node ); + wxSizerItemList::Node *node = m_children.Item( i ); + + wxASSERT_MSG( node, _T("Failed to find SizerItemList node") ); - SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h); + SetItemBounds( node->GetData(), x, y, w, h); } y = y + h + m_vgap; } @@ -828,19 +945,20 @@ wxSize wxGridSizer::CalcMin() int w = 0; int h = 0; - wxNode *node = m_children.First(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - wxSize sz( item->CalcMin() ); + wxSizerItem *item = node->GetData(); + wxSize sz( item->CalcMin() ); + w = wxMax( w, sz.x ); h = wxMax( h, sz.y ); - node = node->Next(); + node = node->GetNext(); } - return wxSize(ncols * w + (ncols-1) * m_hgap, - nrows * h + (nrows-1) * m_vgap); + return wxSize( ncols * w + (ncols-1) * m_hgap, + nrows * h + (nrows-1) * m_vgap ); } void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ) @@ -882,48 +1000,21 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h ) //--------------------------------------------------------------------------- wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap ) - : wxGridSizer( rows, cols, vgap, hgap ) + : wxGridSizer( rows, cols, vgap, hgap ), + m_flexDirection(wxBOTH), + m_growMode(wxFLEX_GROWMODE_SPECIFIED) { - m_rowHeights = (int*) NULL; - m_colWidths = (int*) NULL; } wxFlexGridSizer::wxFlexGridSizer( int cols, int vgap, int hgap ) - : wxGridSizer( cols, vgap, hgap ) + : wxGridSizer( cols, vgap, hgap ), + m_flexDirection(wxBOTH), + m_growMode(wxFLEX_GROWMODE_SPECIFIED) { - m_rowHeights = (int*) NULL; - m_colWidths = (int*) NULL; } wxFlexGridSizer::~wxFlexGridSizer() { - if (m_rowHeights) - delete[] m_rowHeights; - if (m_colWidths) - delete[] m_colWidths; -} - -void wxFlexGridSizer::CreateArrays() -{ - if (m_rowHeights) - delete[] m_rowHeights; - if (m_colWidths) - delete[] m_colWidths; - - int nitems, nrows, ncols; - if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 ) - { - m_rowHeights = - m_colWidths = NULL; - } - - m_rowHeights = new int[nrows]; - m_colWidths = new int[ncols]; - - for (int col = 0; col < ncols; col++) - m_colWidths[ col ] = 0; - for (int row = 0; row < nrows; row++) - m_rowHeights[ row ] = 0; } void wxFlexGridSizer::RecalcSizes() @@ -936,36 +1027,93 @@ void wxFlexGridSizer::RecalcSizes() wxSize minsz( CalcMin() ); wxPoint pt( GetPosition() ); int delta; - size_t idx,num; + size_t idx, num; wxArrayInt temp; + wxArrayInt temp_proportions; + int sum_proportions = 0; + int growable_space = 0; - // Transfer only those rows into temp which exist in the sizer - // ignoring the superflouus ones. This prevents a segfault when - // calling AddGrowableRow( 3 ) if the sizer only has 2 rows. - for (idx = 0; idx < m_growableRows.GetCount(); idx++) - if (m_growableRows[idx] < nrows) - temp.Add( m_growableRows[idx] ); - num = temp.GetCount(); + // what to do with the rows? by default, resize them proportionally + if ( (m_flexDirection & wxVERTICAL) || + (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) + { + // Transfer only those rows into temp which exist in the sizer + // ignoring the superfluous ones. This prevents a segfault when + // calling AddGrowableRow( 3 ) if the sizer only has 2 rows. + for (idx = 0; idx < m_growableRows.GetCount(); idx++) + { + if (m_growableRows[idx] < nrows) + { + temp.Add( m_growableRows[idx] ); + temp_proportions.Add( m_growableRowsProportions[idx] ); + sum_proportions += m_growableRowsProportions[idx]; + growable_space += m_rowHeights[ temp[idx] ]; + } + } + + num = temp.GetCount(); - if ((num > 0) && (sz.y > minsz.y)) + if ((num > 0) && (sz.y > minsz.y)) + { + for (idx = 0; idx < num; idx++) + { + delta = (sz.y - minsz.y); + if (sum_proportions == 0) + delta = (delta/num) + m_rowHeights[ temp[idx] ]; + else + delta = ((delta+growable_space)*temp_proportions[idx])/ + sum_proportions; + m_rowHeights[ temp[idx] ] = delta; + } + } + temp.Empty(); + temp_proportions.Empty(); + sum_proportions = 0; + growable_space = 0; + } + else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) ) { - delta = (sz.y - minsz.y) / num; - for (idx = 0; idx < num; idx++) - m_rowHeights[ temp[idx] ] += delta; + // rounding problem? + for ( int row = 0; row < nrows; ++row ) + m_rowHeights[ row ] = sz.y / nrows; } - temp.Empty(); - // See above - for (idx = 0; idx < m_growableCols.GetCount(); idx++) - if (m_growableCols[idx] < ncols) - temp.Add( m_growableCols[idx] ); - num = temp.GetCount(); + // the same logic as above but for the columns + if ( (m_flexDirection & wxHORIZONTAL) || + (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) + { + // See above + for (idx = 0; idx < m_growableCols.GetCount(); idx++) + { + if (m_growableCols[idx] < ncols) + { + temp.Add( m_growableCols[idx] ); + temp_proportions.Add( m_growableColsProportions[idx] ); + sum_proportions += m_growableColsProportions[idx]; + growable_space += m_colWidths[idx]; + } + } + + num = temp.GetCount(); - if ((num > 0) && (sz.x > minsz.x)) + if ((num > 0) && (sz.x > minsz.x)) + { + for (idx = 0; idx < num; idx++) + { + delta = (sz.x - minsz.x); + if (sum_proportions == 0) + delta = (delta/num) + m_colWidths[ temp[idx] ]; + else + delta = ((delta+growable_space)*temp_proportions[idx])/ + sum_proportions; + m_colWidths[ temp[idx] ] = delta; + } + } + } + else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) ) { - delta = (sz.x - minsz.x) / num; - for (idx = 0; idx < num; idx++) - m_colWidths[ temp[idx] ] += delta; + for ( int col=0; col < ncols; ++col ) + m_colWidths[ col ] = sz.x / ncols; } sz = wxSize( pt.x + sz.x, pt.y + sz.y ); @@ -979,13 +1127,14 @@ void wxFlexGridSizer::RecalcSizes() int i = r * ncols + c; if (i < nitems) { - wxNode *node = m_children.Nth( i ); - wxASSERT( node ); + wxSizerItemList::Node *node = m_children.Item( i ); + + wxASSERT_MSG( node, _T("Failed to find node") ); int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) ); int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) ); - SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h); + SetItemBounds( node->GetData(), x, y, w, h); } y = y + m_rowHeights[r] + m_vgap; } @@ -995,27 +1144,71 @@ void wxFlexGridSizer::RecalcSizes() wxSize wxFlexGridSizer::CalcMin() { - int nitems, nrows, ncols; - if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 ) - return wxSize(10,10); + int nrows, + ncols; + size_t i, s; + + if ( !CalcRowsCols(nrows, ncols) ) + return wxSize(10, 10); - CreateArrays(); + // We have to clear the old sizes out if any item has wxADJUST_MINSIZE + // set on it. Its probably quicker to just always do it than test for + // that though. At least do it before resizing the arrays, SetCount will + // initialise new elements to zero. + for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i ) + m_rowHeights[ i ] = 0; - int i = 0; - wxNode *node = m_children.First(); + for( s = m_colWidths.GetCount(), i = 0; i < s; ++i ) + m_colWidths[ i ] = 0; + + m_rowHeights.SetCount(nrows); + m_colWidths.SetCount(ncols); + + wxSizerItemList::Node *node = m_children.GetFirst(); + + i = 0; while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - wxSize sz( item->CalcMin() ); - int row = i / ncols; - int col = i % ncols; + wxSizerItem *item = node->GetData(); + wxSize sz( item->CalcMin() ); + int row = i / ncols; + int col = i % ncols; + m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] ); m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] ); - node = node->Next(); + node = node->GetNext(); i++; } + // the logic above 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* + // resize flexibly + wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths + : m_rowHeights; + + const int count = array.GetCount(); + + // find the largest value in this array + int n, + largest = 0; + for ( n = 0; n < count; ++n ) + { + if ( array[n] > largest ) + largest = array[n]; + } + + // and now fill it with the largest value + for ( n = 0; n < count; ++n ) + { + array[n] = largest; + } + } + + int width = 0; for (int col = 0; col < ncols; col++) width += m_colWidths[ col ]; @@ -1028,18 +1221,20 @@ wxSize wxFlexGridSizer::CalcMin() height + (nrows-1) * m_vgap); } -void wxFlexGridSizer::AddGrowableRow( size_t idx ) +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::AddGrowableCol( size_t idx ) +void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion ) { m_growableCols.Add( idx ); + m_growableColsProportions.Add( proportion ); } void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) ) @@ -1051,8 +1246,8 @@ void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) ) //--------------------------------------------------------------------------- wxBoxSizer::wxBoxSizer( int orient ) + : m_orient( orient ) { - m_orient = orient; } void wxBoxSizer::RecalcSizes() @@ -1078,22 +1273,23 @@ void wxBoxSizer::RecalcSizes() wxPoint pt( m_position ); - wxNode *node = m_children.GetFirst(); + wxSizerItemList::Node *node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem *item = node->GetData(); + if (item->IsShown()) { int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); + if (item->GetProportion()) + weight = item->GetProportion(); wxSize size( item->CalcMin() ); if (m_orient == wxVERTICAL) { wxCoord height = size.y; - if (item->GetOption()) + if (item->GetProportion()) { height = (delta * weight) + extra; extra = 0; // only the first item will get the remainder as extra size @@ -1118,7 +1314,7 @@ void wxBoxSizer::RecalcSizes() else { wxCoord width = size.x; - if (item->GetOption()) + if (item->GetProportion()) { width = (delta * weight) + extra; extra = 0; // only the first item will get the remainder as extra size @@ -1142,7 +1338,7 @@ void wxBoxSizer::RecalcSizes() } } - node = node->Next(); + node = node->GetNext(); } } @@ -1158,14 +1354,16 @@ wxSize wxBoxSizer::CalcMin() m_fixedHeight = 0; // Find how long each stretch unit needs to be - int stretchSize = 1; - wxNode *node = m_children.GetFirst(); + int stretchSize = 1; + wxSizerItemList::Node *node = m_children.GetFirst(); + while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); - if (item->IsShown() && item->GetOption() != 0) + wxSizerItem *item = node->GetData(); + + if (item->IsShown() && item->GetProportion() != 0) { - int stretch = item->GetOption(); + int stretch = item->GetProportion(); wxSize size( item->CalcMin() ); int sizePerStretch; // Integer division rounded up is (a + b - 1) / b @@ -1176,24 +1374,26 @@ wxSize wxBoxSizer::CalcMin() if (sizePerStretch > stretchSize) stretchSize = sizePerStretch; } - node = node->Next(); + node = node->GetNext(); } + // Calculate overall minimum size node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem *item = node->GetData(); + if (item->IsShown()) { - m_stretchable += item->GetOption(); + m_stretchable += item->GetProportion(); wxSize size( item->CalcMin() ); - if (item->GetOption() != 0) + if (item->GetProportion() != 0) { if (m_orient == wxHORIZONTAL) - size.x = stretchSize * item->GetOption(); + size.x = stretchSize * item->GetProportion(); else - size.y = stretchSize * item->GetOption(); + size.y = stretchSize * item->GetProportion(); } if (m_orient == wxHORIZONTAL) @@ -1207,7 +1407,7 @@ wxSize wxBoxSizer::CalcMin() m_minWidth = wxMax( m_minWidth, size.x ); } - if (item->GetOption() == 0) + if (item->GetProportion() == 0) { if (m_orient == wxVERTICAL) { @@ -1221,7 +1421,7 @@ wxSize wxBoxSizer::CalcMin() } } } - node = node->Next(); + node = node->GetNext(); } return wxSize( m_minWidth, m_minHeight ); @@ -1234,26 +1434,30 @@ wxSize wxBoxSizer::CalcMin() #if wxUSE_STATBOX wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) - : wxBoxSizer( orient ) + : wxBoxSizer( orient ) + , m_staticBox( box ) { wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") ); - - m_staticBox = box; } -static void GetStaticBoxBorders(wxStaticBox *box, - int *borderTop, int *borderOther) +static void GetStaticBoxBorders( wxStaticBox *box, + int *borderTop, + int *borderOther) { // this has to be done platform by platform as there is no way to // guess the thickness of a wxStaticBox border +#ifdef __WXCOCOA__ + box->GetBordersForSizer(borderTop,borderOther); +#else // __WXCOCOA__ #ifdef __WXGTK__ if ( box->GetLabel().IsEmpty() ) *borderTop = 5; else #endif // __WXGTK__ - *borderTop = 15; - (void)box; + *borderTop = box->GetCharHeight(); + *borderOther = 5; +#endif // __WXCOCOA__ } void wxStaticBoxSizer::RecalcSizes() @@ -1297,10 +1501,9 @@ wxSize wxStaticBoxSizer::CalcMin() #if wxUSE_NOTEBOOK wxNotebookSizer::wxNotebookSizer( wxNotebook *nb ) + : m_notebook( nb ) { wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") ); - - m_notebook = nb; } void wxNotebookSizer::RecalcSizes()