X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec4e4a14154f7fafa3ada9bd9b4168916b75c095..24aab8e81a8627802e4111d9c99a50ece8d0026e:/src/common/sizer.cpp?ds=sidebyside diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 21f311e59b..ed390865d6 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sizer.cpp +// Name: src/common/sizer.cpp // Purpose: provide new wxSizer class for layout // Author: Robert Roebling and Robin Dunn, contributions by // Dirk Holtwick, Ron Lee @@ -10,10 +10,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "sizer.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -22,10 +18,22 @@ #endif #include "wx/sizer.h" -#include "wx/utils.h" -#include "wx/statbox.h" -#include "wx/notebook.h" -#include + +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/math.h" + #include "wx/utils.h" + #include "wx/settings.h" + #include "wx/button.h" + #include "wx/statbox.h" +#endif // WX_PRECOMP + +#include "wx/listimpl.cpp" + +#if WXWIN_COMPATIBILITY_2_4 + #include "wx/notebook.h" +#endif //--------------------------------------------------------------------------- @@ -37,79 +45,208 @@ IMPLEMENT_CLASS(wxBoxSizer, wxSizer) #if wxUSE_STATBOX IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer) #endif -#if wxUSE_NOTEBOOK -IMPLEMENT_CLASS(wxNotebookSizer, wxSizer) +#if wxUSE_BUTTON +IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer) #endif -WX_DEFINE_EXPORTED_LIST( wxSizerItemList ); +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(const wxSizerFlags& flags) +{ + Init(); + m_proportion = flags.GetProportion(); + m_flag = flags.GetFlags(); + m_border = flags.GetBorderInPixels(); +} -//--------------------------------------------------------------------------- -// wxSizerItem -//--------------------------------------------------------------------------- +wxSizerItem::wxSizerItem() +{ + Init(); + + m_proportion = 0; + m_border = 0; + m_flag = 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_proportion( proportion ) - , m_border( border ) - , m_flag( flag ) - , m_show( true ) - , m_userData( userData ) -{ - SetRatio( m_size ); -} - -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 ) + m_kind = Item_None; +} + +// window item +void wxSizerItem::SetWindow(wxWindow *window) { + wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") ); + + m_kind = Item_Window; + m_window = window; + + // window doesn't become smaller than its initial size, whatever happens + m_minSize = window->GetSize(); + + if ( m_flag & wxFIXED_MINSIZE ) + window->SetMinSize(m_minSize); + // aspect ratio calculated from initial size - SetRatio( m_minSize ); + SetRatio(m_minSize); +} + +wxSizerItem::wxSizerItem(wxWindow *window, + int proportion, + int flag, + int border, + wxObject* userData) + : m_proportion(proportion), + m_border(border), + m_flag(flag), + m_userData(userData) +{ + SetWindow(window); +} + +// sizer item +void wxSizerItem::SetSizer(wxSizer *sizer) +{ + m_kind = Item_Sizer; + m_sizer = sizer; +} + +wxSizerItem::wxSizerItem(wxSizer *sizer, + int proportion, + int flag, + int border, + wxObject* userData) + : m_proportion(proportion), + m_border(border), + m_flag(flag), + m_ratio(0.0), + m_userData(userData) +{ + SetSizer(sizer); + + // m_minSize is set later +} - // m_size is calculated later +// spacer item +void wxSizerItem::SetSpacer(const wxSize& size) +{ + m_kind = Item_Spacer; + m_spacer = new wxSizerSpacer(size); + m_minSize = size; + SetRatio(size); } -wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) - : m_window( NULL ) - , m_sizer( sizer ) - , m_proportion( proportion ) - , m_border( border ) - , m_flag( flag ) - , m_show( true ) - , m_ratio( 0.0 ) - , m_userData( userData ) +wxSizerItem::wxSizerItem(int width, + int height, + int proportion, + int flag, + int border, + wxObject* userData) + : m_minSize(width, height), // minimal size is the initial size + m_proportion(proportion), + m_border(border), + m_flag(flag), + m_userData(userData) { - // m_minSize is calculated later - // m_size is calculated later + SetSpacer(width, height); } wxSizerItem::~wxSizerItem() { - if (m_userData) - delete m_userData; - if (m_sizer) - delete m_sizer; + delete m_userData; + + switch ( m_kind ) + { + case Item_None: + break; + + case Item_Window: + m_window->SetContainingSizer(NULL); + break; + + case Item_Sizer: + delete m_sizer; + break; + + case Item_Spacer: + delete m_spacer; + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } +} + +wxSize wxSizerItem::GetSpacer() const +{ + wxSize size; + if ( m_kind == Item_Spacer ) + size = m_spacer->GetSize(); + + return size; } wxSize wxSizerItem::GetSize() const { wxSize ret; - if (IsSizer()) - ret = m_sizer->GetSize(); - else - if (IsWindow()) - ret = m_window->GetSize(); - else ret = m_size; + switch ( m_kind ) + { + case Item_None: + break; + + case Item_Window: + ret = m_window->GetSize(); + break; + + case Item_Sizer: + ret = m_sizer->GetSize(); + break; + + case Item_Spacer: + ret = m_spacer->GetSize(); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } if (m_flag & wxWEST) ret.x += m_border; @@ -125,30 +262,29 @@ wxSize wxSizerItem::GetSize() const 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); + if ( (m_flag & wxSHAPED) && wxIsNullDouble(m_ratio) ) + 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) @@ -161,8 +297,11 @@ wxSize wxSizerItem::CalcMin() return ret; } -void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) + +void wxSizerItem::SetDimension( const wxPoint& pos_, const wxSize& size_ ) { + wxPoint pos = pos_; + wxSize size = size_; if (m_flag & wxSHAPED) { // adjust aspect ratio @@ -214,184 +353,205 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) size.y -= m_border; } - if (IsSizer()) - m_sizer->SetDimension( pos.x, pos.y, size.x, size.y ); + m_rect = wxRect(pos, size); - if (IsWindow()) - m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE ); + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("can't set size of uninitialized sizer item") ); + break; - m_size = size; -} + case Item_Window: + m_window->SetSize(pos.x, pos.y, size.x, size.y, + wxSIZE_ALLOW_MINUS_ONE); + break; -void wxSizerItem::DeleteWindows() -{ - if (m_window) - m_window->Destroy(); + case Item_Sizer: + m_sizer->SetDimension(pos.x, pos.y, size.x, size.y); + break; - if (m_sizer) - m_sizer->DeleteWindows(); -} + case Item_Spacer: + m_spacer->SetSize(size); + break; -bool wxSizerItem::IsWindow() const -{ - return (m_window != NULL); + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } } -bool wxSizerItem::IsSizer() const +void wxSizerItem::DeleteWindows() { - return (m_sizer != NULL); -} + switch ( m_kind ) + { + case Item_None: + case Item_Spacer: + break; -bool wxSizerItem::IsSpacer() const -{ - return (m_window == NULL) && (m_sizer == NULL); -} + case Item_Window: + //We are deleting the window from this sizer - normally + //the window destroys the sizer associated with it, + //which might destroy this, which we don't want + m_window->SetContainingSizer(NULL); + m_window->Destroy(); + //Putting this after the switch will result in a spacer + //not being deleted properly on destruction + m_kind = Item_None; + break; -void wxSizerItem::Show( bool show ) -{ - m_show = show; + case Item_Sizer: + m_sizer->DeleteWindows(); + break; - if( IsWindow() ) - m_window->Show( show ); - else if( IsSizer() ) - m_sizer->ShowItems( show ); + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } - // ... nothing else to do to hide/show spacers } -void wxSizerItem::SetOption( int option ) +void wxSizerItem::Show( bool show ) { - SetProportion( option ); -} + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("can't show uninitialized sizer item") ); + break; -int wxSizerItem::GetOption() const -{ - return GetProportion(); -} + case Item_Window: + m_window->Show(show); + break; + case Item_Sizer: + m_sizer->Show(show); + break; -//--------------------------------------------------------------------------- -// wxSizer -//--------------------------------------------------------------------------- + case Item_Spacer: + m_spacer->Show(show); + break; -wxSizer::wxSizer() - : m_minSize( wxSize( 0, 0 ) ) -{ - m_children.DeleteContents( true ); + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } } -wxSizer::~wxSizer() +bool wxSizerItem::IsShown() const { - Clear(); -} + switch ( m_kind ) + { + case Item_None: + // we may be called from CalcMin(), just return false so that we're + // not used + break; -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 ); -} + case Item_Window: + return m_window->IsShown(); -void wxSizer::Add( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) -{ - m_children.Append( new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} + case Item_Sizer: + // arbitrarily decide that if at least one of our elements is + // shown, so are we (this arbitrariness is the reason for + // deprecating this function) + { + for ( wxSizerItemList::compatibility_iterator + node = m_sizer->GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + if ( node->GetData()->IsShown() ) + return true; + } + } + return false; -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 ) ); -} + case Item_Spacer: + return m_spacer->IsShown(); -void wxSizer::Add( wxSizerItem *item ) -{ - m_children.Append( item ); + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } - if( item->GetWindow() ) - item->GetWindow()->SetContainingSizer( this ); + return false; } -void wxSizer::Prepend( wxWindow *window, int proportion, int flag, int border, wxObject* userData ) +#if WXWIN_COMPATIBILITY_2_6 +void wxSizerItem::SetOption( int option ) { - m_children.Insert( new wxSizerItem( window, proportion, flag, border, userData ) ); - window->SetContainingSizer( this ); + SetProportion( option ); } -void wxSizer::Prepend( wxSizer *sizer, int proportion, int flag, int border, wxObject* userData ) +int wxSizerItem::GetOption() const { - m_children.Insert( new wxSizerItem( sizer, proportion, flag, border, userData ) ); + return GetProportion(); } +#endif // WXWIN_COMPATIBILITY_2_6 -void wxSizer::Prepend( int width, int height, int proportion, int flag, int border, wxObject* userData ) + +//--------------------------------------------------------------------------- +// wxSizer +//--------------------------------------------------------------------------- + +wxSizer::~wxSizer() { - m_children.Insert( new wxSizerItem( width, height, proportion, flag, border, userData ) ); + WX_CLEAR_LIST(wxSizerItemList, m_children); } -void wxSizer::Prepend( wxSizerItem *item ) +wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item ) { - m_children.Insert( item ); + m_children.Insert( index, item ); - if( item->GetWindow() ) + 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 ); + return item; } -void wxSizer::Insert( size_t index, - wxSizer *sizer, - int proportion, - int flag, - int border, - wxObject* userData ) +void wxSizer::SetContainingWindow(wxWindow *win) { - m_children.Insert( index, - new wxSizerItem( sizer, proportion, flag, border, userData ) ); -} + if ( win == m_containingWindow ) + return; -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 ) ); -} + m_containingWindow = win; -void wxSizer::Insert( size_t index, wxSizerItem *item ) -{ - m_children.Insert( index, item ); + // set the same window for all nested sizers as well, they also are in the + // same window + for ( wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + node; + node = node->GetNext() ) + { + wxSizerItem *const item = node->GetData(); + wxSizer *const sizer = item->GetSizer(); - if( item->GetWindow() ) - item->GetWindow()->SetContainingSizer( this ); + if ( sizer ) + { + sizer->SetContainingWindow(win); + } + } } +#if WXWIN_COMPATIBILITY_2_6 bool wxSizer::Remove( wxWindow *window ) { return Detach( window ); } +#endif // WXWIN_COMPATIBILITY_2_6 bool wxSizer::Remove( wxSizer *sizer ) { 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(); } @@ -405,23 +565,25 @@ bool wxSizer::Remove( int index ) 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") ); wxSizerItem *item = node->GetData(); - if( item->IsWindow() ) + 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(); @@ -429,7 +591,9 @@ bool wxSizer::Detach( wxSizer *sizer ) if (item->GetSizer() == sizer) { item->DetachSizer(); - return m_children.DeleteNode( node ); + delete item; + m_children.Erase( node ); + return true; } node = node->GetNext(); } @@ -441,7 +605,7 @@ bool wxSizer::Detach( wxWindow *window ) { 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(); @@ -449,7 +613,9 @@ bool wxSizer::Detach( wxWindow *window ) if (item->GetWindow() == window) { item->GetWindow()->SetContainingSizer( NULL ); - return m_children.DeleteNode( node ); + delete item; + m_children.Erase( node ); + return true; } node = node->GetNext(); } @@ -463,24 +629,100 @@ bool wxSizer::Detach( int index ) 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") ); wxSizerItem *item = node->GetData(); - if( item->IsSizer() ) + if ( item->IsSizer() ) item->DetachSizer(); - else if( item->IsWindow() ) + else if ( item->IsWindow() ) item->GetWindow()->SetContainingSizer( NULL ); - return m_children.DeleteNode( node ); + delete item; + m_children.Erase( node ); + return true; +} + +bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive ) +{ + wxASSERT_MSG( oldwin, _T("Replacing NULL window") ); + wxASSERT_MSG( newwin, _T("Replacing with NULL window") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetWindow() == oldwin) + { + item->GetWindow()->SetContainingSizer( NULL ); + item->SetWindow(newwin); + newwin->SetContainingSizer( this ); + return true; + } + else if (recursive && item->IsSizer()) + { + if (item->GetSizer()->Replace( oldwin, newwin, true )) + return true; + } + + node = node->GetNext(); + } + + return false; +} + +bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive ) +{ + wxASSERT_MSG( oldsz, _T("Replacing NULL sizer") ); + wxASSERT_MSG( newsz, _T("Replacing with NULL sizer") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetSizer() == oldsz) + { + wxSizer *old = item->GetSizer(); + item->SetSizer(newsz); + delete old; + return true; + } + else if (recursive && item->IsSizer()) + { + if (item->GetSizer()->Replace( oldsz, newsz, true )) + return true; + } + + node = node->GetNext(); + } + + return false; +} + +bool wxSizer::Replace( size_t old, wxSizerItem *newitem ) +{ + wxCHECK_MSG( old < m_children.GetCount(), false, _T("Replace index is out of range") ); + wxASSERT_MSG( newitem, _T("Replacing with NULL item") ); + + wxSizerItemList::compatibility_iterator node = m_children.Item( old ); + + wxCHECK_MSG( node, false, _T("Failed to find child node") ); + + wxSizerItem *item = node->GetData(); + node->SetData(newitem); + delete item; + + 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(); @@ -495,12 +737,12 @@ void wxSizer::Clear( bool delete_windows ) 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(); @@ -512,11 +754,8 @@ void wxSizer::DeleteWindows() 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 ); @@ -536,7 +775,11 @@ void wxSizer::FitInside( wxWindow *window ) 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(); } @@ -581,17 +824,30 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window ) 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 ) { + if ( window->IsTopLevel() ) + { + wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow); + if ( tlw && tlw->IsAlwaysMaximized() ) + { + return tlw->GetClientSize(); + } + } + wxSize size = GetMinWindowSize( window ); wxSize sizeMax = GetMaxWindowSize( 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; @@ -601,7 +857,7 @@ wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const { wxSize maxSize( window->GetMaxSize() ); - if( maxSize != wxDefaultSize ) + if ( maxSize != wxDefaultSize ) { wxSize size( window->GetSize() ); wxSize client_size( window->GetClientSize() ); @@ -625,9 +881,9 @@ wxSize wxSizer::VirtualFitSize( 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; @@ -662,14 +918,14 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height ) // 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(); @@ -700,7 +956,7 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height ) // Is it our immediate child? - wxSizerItemList::Node *node = m_children.GetFirst(); + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); while (node) { wxSizerItem *item = node->GetData(); @@ -734,7 +990,7 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height ) 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") ); @@ -747,60 +1003,116 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height ) } 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 ) +wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive ) { - wxASSERT_MSG( window, _T("Show for NULL window") ); + wxASSERT_MSG( window, _T("GetItem 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 item; + } + else if (recursive && item->IsSizer()) + { + wxSizerItem *subitem = item->GetSizer()->GetItem( window, true ); + if (subitem) + return subitem; } + node = node->GetNext(); } + + return NULL; } -void wxSizer::Show( wxSizer *sizer, bool show ) +wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive ) { - wxASSERT_MSG( sizer, _T("Show for NULL sizer") ); + wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") ); - wxSizerItemList::Node *node = m_children.GetFirst(); + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); while (node) { - wxSizerItem *item = node->GetData(); + wxSizerItem *item = node->GetData(); if (item->GetSizer() == sizer) { - item->Show( show ); - break; + return item; + } + else if (recursive && item->IsSizer()) + { + wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true ); + if (subitem) + return subitem; } + node = node->GetNext(); } + + return NULL; +} + +wxSizerItem* wxSizer::GetItem( size_t index ) +{ + wxCHECK_MSG( index < m_children.GetCount(), + NULL, + _T("GetItem index is out of range") ); + + return m_children.Item( index )->GetData(); +} + +bool wxSizer::Show( wxWindow *window, bool show, bool recursive ) +{ + wxSizerItem *item = GetItem( window, recursive ); + + if ( item ) + { + item->Show( show ); + return true; + } + + return false; +} + +bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive ) +{ + wxSizerItem *item = GetItem( sizer, recursive ); + + if ( item ) + { + item->Show( show ); + return true; + } + + return false; } -void wxSizer::Show( size_t index, bool show ) +bool wxSizer::Show( size_t index, bool show) { - wxCHECK_RET( index < m_children.GetCount(), - _T("Show index is out of range") ); + wxSizerItem *item = GetItem( index ); - m_children.Item( index )->GetData()->Show( show ); + if ( item ) + { + item->Show( show ); + return true; + } + + return false; } void wxSizer::ShowItems( bool show ) { - wxSizerItemList::Node *node = m_children.GetFirst(); + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); while (node) { node->GetData()->Show( show ); @@ -810,7 +1122,7 @@ void wxSizer::ShowItems( bool 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(); @@ -829,7 +1141,7 @@ bool wxSizer::IsShown( wxWindow *window ) const 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(); @@ -861,7 +1173,7 @@ bool wxSizer::IsShown( size_t index ) const //--------------------------------------------------------------------------- wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) - : m_rows( rows ) + : m_rows( ( cols == 0 && rows == 0 ) ? 1 : rows ) , m_cols( cols ) , m_vgap( vgap ) , m_hgap( hgap ) @@ -869,7 +1181,7 @@ wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap ) } wxGridSizer::wxGridSizer( int cols, int vgap, int hgap ) - : m_rows( 0 ) + : m_rows( cols == 0 ? 1 : 0 ) , m_cols( cols ) , m_vgap( vgap ) , m_hgap( hgap ) @@ -923,7 +1235,7 @@ void wxGridSizer::RecalcSizes() 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") ); @@ -937,15 +1249,15 @@ void wxGridSizer::RecalcSizes() wxSize wxGridSizer::CalcMin() { - int nitems, nrows, ncols; - if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 ) - return wxSize(10, 10); + int nrows, ncols; + if ( CalcRowsCols(nrows, ncols) == 0 ) + return wxSize(); // 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(); @@ -964,7 +1276,7 @@ wxSize wxGridSizer::CalcMin() 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)) @@ -1023,98 +1335,10 @@ void wxFlexGridSizer::RecalcSizes() if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 ) return; - wxSize sz( GetSize() ); - wxSize minsz( CalcMin() ); wxPoint pt( GetPosition() ); - int delta; - size_t idx, num; - wxArrayInt temp; - wxArrayInt temp_proportions; - int sum_proportions = 0; - int growable_space = 0; - - // 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)) - { - 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) ) - { - // 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 ( (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(); + wxSize sz( GetSize() ); - 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) ) - { - 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 ); @@ -1127,7 +1351,7 @@ void wxFlexGridSizer::RecalcSizes() 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") ); @@ -1136,9 +1360,11 @@ void wxFlexGridSizer::RecalcSizes() SetItemBounds( node->GetData(), x, y, w, h); } - y = y + m_rowHeights[r] + m_vgap; + if (m_rowHeights[r] != -1) + y = y + m_rowHeights[r] + m_vgap; } - x = x + m_colWidths[c] + m_hgap; + if (m_colWidths[c] != -1) + x = x + m_colWidths[c] + m_hgap; } } @@ -1148,41 +1374,69 @@ wxSize wxFlexGridSizer::CalcMin() ncols; size_t i, s; + // Number of rows/columns can change as items are added or removed. if ( !CalcRowsCols(nrows, ncols) ) - return wxSize(10, 10); - - // 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; - - for( s = m_colWidths.GetCount(), i = 0; i < s; ++i ) - m_colWidths[ i ] = 0; + return wxSize(); m_rowHeights.SetCount(nrows); m_colWidths.SetCount(ncols); - wxSizerItemList::Node *node = m_children.GetFirst(); + // 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::compatibility_iterator node = m_children.GetFirst(); i = 0; while (node) { wxSizerItem *item = node->GetData(); - wxSize sz( item->CalcMin() ); - int row = i / ncols; - int col = i % ncols; + if ( item->IsShown() ) + { + 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 ] ); + m_rowHeights[ row ] = wxMax( wxMax( 0, sz.y ), m_rowHeights[ row ] ); + m_colWidths[ col ] = wxMax( wxMax( 0, sz.x ), m_colWidths[ col ] ); + } node = node->GetNext(); 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 ] + 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 ); + 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* @@ -1190,11 +1444,12 @@ wxSize wxFlexGridSizer::CalcMin() wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths : m_rowHeights; - const int count = array.GetCount(); + const size_t count = array.GetCount(); // find the largest value in this array - int n, - largest = 0; + size_t n; + int largest = 0; + for ( n = 0; n < count; ++n ) { if ( array[n] > largest ) @@ -1207,38 +1462,155 @@ wxSize wxFlexGridSizer::CalcMin() array[n] = largest; } } +} - int width = 0; - for (int col = 0; col < ncols; col++) - width += m_colWidths[ col ]; +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++; + } - int height = 0; - for (int row = 0; row < nrows; row++) - height += m_rowHeights[ row ]; + 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 + (ncols-1) * m_hgap, - height + (nrows-1) * m_vgap); + // 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::AddGrowableCol( size_t idx, int proportion ) { m_growableCols.Add( idx ); m_growableColsProportions.Add( proportion ); } -void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) ) +// helper function for RemoveGrowableCol/Row() +static void +DoRemoveFromArrays(size_t idx, wxArrayInt& items, wxArrayInt& proportions) { + const size_t count = items.size(); + for ( size_t n = 0; n < count; n++ ) + { + if ( (size_t)items[n] == idx ) + { + items.RemoveAt(n); + proportions.RemoveAt(n); + return; + } + } + + wxFAIL_MSG( _T("column/row is already not growable") ); +} + +void wxFlexGridSizer::RemoveGrowableCol( size_t idx ) +{ + DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions); +} + +void wxFlexGridSizer::RemoveGrowableRow( size_t idx ) +{ + DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions); } //--------------------------------------------------------------------------- @@ -1256,47 +1628,37 @@ void wxBoxSizer::RecalcSizes() 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 ); - wxSize child_size( wxSize( size.x, height) ); + wxSize child_size( size.x, height ); if (item->GetFlag() & (wxEXPAND | wxSHAPED)) child_size.x = m_size.x; @@ -1316,12 +1678,13 @@ void wxBoxSizer::RecalcSizes() 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 ); - wxSize child_size( wxSize(width, size.y) ); + wxSize child_size( width, size.y ); if (item->GetFlag() & (wxEXPAND | wxSHAPED)) child_size.y = m_size.y; @@ -1332,6 +1695,16 @@ void wxBoxSizer::RecalcSizes() // wxALIGN_CENTER should be used in new code child_pos.y += (m_size.y - size.y) / 2; + if ( m_containingWindow ) + { + child_pos.x = m_containingWindow->AdjustForLayoutDirection + ( + child_pos.x, + width, + m_size.x + ); + } + item->SetDimension( child_pos, child_size ); pt.x += width; @@ -1345,7 +1718,7 @@ void wxBoxSizer::RecalcSizes() wxSize wxBoxSizer::CalcMin() { if (m_children.GetCount() == 0) - return wxSize(10,10); + return wxSize(); m_stretchable = 0; m_minWidth = 0; @@ -1353,26 +1726,46 @@ wxSize wxBoxSizer::CalcMin() 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 + 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(); } @@ -1381,33 +1774,19 @@ wxSize wxBoxSizer::CalcMin() 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) { @@ -1420,6 +1799,17 @@ wxSize wxBoxSizer::CalcMin() 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(); } @@ -1434,10 +1824,27 @@ wxSize wxBoxSizer::CalcMin() #if wxUSE_STATBOX wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient ) - : wxBoxSizer( orient ) - , m_staticBox( box ) + : wxBoxSizer( orient ), + m_staticBox( box ) { wxASSERT_MSG( box, wxT("wxStaticBoxSizer needs a static box") ); + + // do this so that our Detach() is called if the static box is destroyed + // before we are + m_staticBox->SetContainingSizer(this); +} + +wxStaticBoxSizer::wxStaticBoxSizer(int orient, wxWindow *win, const wxString& s) + : wxBoxSizer(orient), + m_staticBox(new wxStaticBox(win, wxID_ANY, s)) +{ + // same as above + m_staticBox->SetContainingSizer(this); +} + +wxStaticBoxSizer::~wxStaticBoxSizer() +{ + delete m_staticBox; } static void GetStaticBoxBorders( wxStaticBox *box, @@ -1446,18 +1853,7 @@ static void GetStaticBoxBorders( wxStaticBox *box, { // 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 = box->GetCharHeight(); - - *borderOther = 5; -#endif // __WXCOCOA__ + box->GetBordersForSizer(borderTop, borderOther); } void wxStaticBoxSizer::RecalcSizes() @@ -1492,33 +1888,249 @@ wxSize wxStaticBoxSizer::CalcMin() return ret; } +void wxStaticBoxSizer::ShowItems( bool show ) +{ + m_staticBox->Show( show ); + wxBoxSizer::ShowItems( show ); +} + +bool wxStaticBoxSizer::Detach( wxWindow *window ) +{ + // avoid deleting m_staticBox in our dtor if it's being detached from the + // sizer (which can happen because it's being already destroyed for + // example) + if ( window == m_staticBox ) + { + m_staticBox = NULL; + return true; + } + + return wxSizer::Detach( window ); +} + #endif // wxUSE_STATBOX -//--------------------------------------------------------------------------- +#if wxUSE_BUTTON + +wxStdDialogButtonSizer::wxStdDialogButtonSizer() + : wxBoxSizer(wxHORIZONTAL) +{ + // Vertical buttons with lots of space on either side + // looks rubbish on WinCE, so let's not do this for now. + // If we are going to use vertical buttons, we should + // put the sizer to the right of other controls in the dialog, + // and that's beyond the scope of this sizer. +#ifndef __WXWINCE__ + bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA); + // If we have a PDA screen, put yes/no button over + // all other buttons, otherwise on the left side. + if (is_pda) + m_orient = wxVERTICAL; +#endif + + m_buttonAffirmative = NULL; + m_buttonApply = NULL; + m_buttonNegative = NULL; + m_buttonCancel = NULL; + m_buttonHelp = NULL; +} + +void wxStdDialogButtonSizer::AddButton(wxButton *mybutton) +{ + switch (mybutton->GetId()) + { + case wxID_OK: + case wxID_YES: + case wxID_SAVE: + m_buttonAffirmative = mybutton; + break; + case wxID_APPLY: + m_buttonApply = mybutton; + break; + case wxID_NO: + m_buttonNegative = mybutton; + break; + case wxID_CANCEL: + m_buttonCancel = mybutton; + break; + case wxID_HELP: + case wxID_CONTEXT_HELP: + m_buttonHelp = mybutton; + break; + default: + break; + } +} + +void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button ) +{ + m_buttonAffirmative = button; +} + +void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button ) +{ + m_buttonNegative = button; +} + +void wxStdDialogButtonSizer::SetCancelButton( wxButton *button ) +{ + m_buttonCancel = button; +} + +void wxStdDialogButtonSizer::Realize() +{ +#ifdef __WXMAC__ + Add(0, 0, 0, wxLEFT, 6); + if (m_buttonHelp) + Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); + + if (m_buttonNegative){ + // HIG POLICE BULLETIN - destructive buttons need extra padding + // 24 pixels on either side + Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 12); + } + + // extra whitespace between help/negative and cancel/ok buttons + Add(0, 0, 1, wxEXPAND, 0); + + if (m_buttonCancel){ + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); + // Cancel or help should be default + // m_buttonCancel->SetDefaultButton(); + } + + // Ugh, Mac doesn't really have apply dialogs, so I'll just + // figure the best place is between Cancel and OK + if (m_buttonApply) + Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); + + if (m_buttonAffirmative){ + Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6); + + 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")); + } + } + + // Extra space around and at the right + Add(12, 24); +#elif defined(__WXGTK20__) + Add(0, 0, 0, wxLEFT, 9); + if (m_buttonHelp) + Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + + // extra whitespace between help and cancel/ok buttons + Add(0, 0, 1, wxEXPAND, 0); + + if (m_buttonNegative){ + Add((wxWindow*)m_buttonNegative, 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__) + // Windows + + // right-justify buttons + Add(0, 0, 1, wxEXPAND, 0); + + if (m_buttonAffirmative){ + Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(2, 0)).x); + } + + if (m_buttonNegative){ + Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(2, 0)).x); + } + + if (m_buttonCancel){ + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(2, 0)).x); + } + if (m_buttonApply) + Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(2, 0)).x); + + if (m_buttonHelp) + Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x); +#else + // GTK+1 and any other platform + + // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog + if (m_buttonHelp) + Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x); + + // extra whitespace between help and cancel/ok buttons + Add(0, 0, 1, wxEXPAND, 0); + + if (m_buttonApply) + Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(4, 0)).x); + + if (m_buttonAffirmative){ + Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(4, 0)).x); + } + + if (m_buttonNegative){ + Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(4, 0)).x); + } + + if (m_buttonCancel){ + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x); + // Cancel or help should be default + // m_buttonCancel->SetDefaultButton(); + } + +#endif +} + +#endif // wxUSE_BUTTON + +#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 ) +#if WXWIN_COMPATIBILITY_2_6 + +wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl) + : m_bookctrl(bookctrl) { - wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") ); + wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") ); } -void wxNotebookSizer::RecalcSizes() +#endif // WXWIN_COMPATIBILITY_2_6 + +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); } @@ -1526,7 +2138,8 @@ wxSize wxNotebookSizer::CalcMin() 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(); @@ -1548,6 +2161,19 @@ wxSize wxNotebookSizer::CalcMin() return wxSize( maxX, maxY ) + sizeBorder; } -#endif // wxUSE_NOTEBOOK +#if wxUSE_NOTEBOOK + +#if WXWIN_COMPATIBILITY_2_6 + +wxNotebookSizer::wxNotebookSizer(wxNotebook *nb) +{ + wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") ); + m_bookctrl = nb; +} + +#endif // WXWIN_COMPATIBILITY_2_6 + +#endif // wxUSE_NOTEBOOOK +#endif // wxUSE_BOOKCTRL -// vi:sts=4:sw=4:et +#endif // WXWIN_COMPATIBILITY_2_4