X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa21b5090ad75a806fe20b6371933302f67d821e..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/sizer.cpp?ds=sidebyside diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index a412637448..375f5c2824 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -1,18 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: sizer.cpp +// Name: src/common/sizer.cpp // Purpose: provide new wxSizer class for layout -// Author: Robert Roebling and Robin Dunn -// Modified by: +// 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "sizer.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -21,99 +18,281 @@ #endif #include "wx/sizer.h" -#include "wx/utils.h" -#include "wx/statbox.h" -#include "wx/notebook.h" +#include "wx/private/flagscheck.h" + +#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" + #include "wx/toplevel.h" +#endif // WX_PRECOMP + +#include "wx/display.h" +#include "wx/listimpl.cpp" + //--------------------------------------------------------------------------- -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_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer); -#if wxUSE_NOTEBOOK -IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, 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_CLASS(wxStaticBoxSizer, wxBoxSizer) +#endif +#if wxUSE_BUTTON +IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer) #endif -//--------------------------------------------------------------------------- -// wxSizerItem -//--------------------------------------------------------------------------- +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::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData ) +// ---------------------------------------------------------------------------- +// wxSizerItem +// ---------------------------------------------------------------------------- + +// check for flags conflicts +static const int SIZER_FLAGS_MASK = + wxADD_FLAG(wxCENTRE, + wxADD_FLAG(wxHORIZONTAL, + wxADD_FLAG(wxVERTICAL, + wxADD_FLAG(wxLEFT, + wxADD_FLAG(wxRIGHT, + wxADD_FLAG(wxUP, + wxADD_FLAG(wxDOWN, + wxADD_FLAG(wxALIGN_NOT, + wxADD_FLAG(wxALIGN_CENTER_HORIZONTAL, + wxADD_FLAG(wxALIGN_RIGHT, + wxADD_FLAG(wxALIGN_BOTTOM, + wxADD_FLAG(wxALIGN_CENTER_VERTICAL, + wxADD_FLAG(wxFIXED_MINSIZE, + wxADD_FLAG(wxRESERVE_SPACE_EVEN_IF_HIDDEN, + wxADD_FLAG(wxSTRETCH_NOT, + wxADD_FLAG(wxSHRINK, + wxADD_FLAG(wxGROW, + wxADD_FLAG(wxSHAPED, + 0)))))))))))))))))); + +#define ASSERT_VALID_SIZER_FLAGS(f) wxASSERT_VALID_FLAGS(f, SIZER_FLAGS_MASK) + + +void wxSizerItem::Init(const wxSizerFlags& flags) { - m_window = (wxWindow *) NULL; - m_sizer = (wxSizer *) NULL; - m_option = option; - m_border = border; - m_flag = flag; - m_userData = userData; + Init(); - // minimal size is the initial size - m_minSize.x = width; - m_minSize.y = height; + m_proportion = flags.GetProportion(); + m_flag = flags.GetFlags(); + m_border = flags.GetBorderInPixels(); - SetRatio(width, height); + ASSERT_VALID_SIZER_FLAGS( m_flag ); +} - // size is set directly - m_size = m_minSize; +wxSizerItem::wxSizerItem() +{ + Init(); + + m_proportion = 0; + m_border = 0; + m_flag = 0; + m_id = wxID_NONE; } -wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData ) +// window item +void wxSizerItem::DoSetWindow(wxWindow *window) { + wxCHECK_RET( window, _T("NULL window in wxSizerItem::SetWindow()") ); + + m_kind = Item_Window; m_window = window; - m_sizer = (wxSizer *) NULL; - m_option = option; - m_border = border; - m_flag = flag; - m_userData = userData; - // minimal size is the initial size + // 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); +} + +wxSizerItem::wxSizerItem(wxWindow *window, + int proportion, + int flag, + int border, + wxObject* userData) + : m_kind(Item_None), + m_proportion(proportion), + m_border(border), + m_flag(flag), + m_id(wxID_NONE), + m_userData(userData) +{ + ASSERT_VALID_SIZER_FLAGS( m_flag ); - // size is calculated later - // m_size = ... + DoSetWindow(window); } -wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +// sizer item +void wxSizerItem::DoSetSizer(wxSizer *sizer) { - m_window = (wxWindow *) NULL; + m_kind = Item_Sizer; m_sizer = sizer; - m_option = option; - m_border = border; - m_flag = flag; - m_userData = userData; +} + +wxSizerItem::wxSizerItem(wxSizer *sizer, + int proportion, + int flag, + int border, + wxObject* userData) + : m_kind(Item_None), + m_sizer(NULL), + m_proportion(proportion), + m_border(border), + m_flag(flag), + m_id(wxID_NONE), + m_ratio(0.0), + m_userData(userData) +{ + ASSERT_VALID_SIZER_FLAGS( m_flag ); - // minimal size is calculated later - // m_minSize = ... - m_ratio = 0; + DoSetSizer(sizer); - // size is calculated later - // m_size = ... + // m_minSize is set later +} + +// spacer item +void wxSizerItem::DoSetSpacer(const wxSize& size) +{ + m_kind = Item_Spacer; + m_spacer = new wxSizerSpacer(size); + m_minSize = size; + SetRatio(size); +} + +wxSizerItem::wxSizerItem(int width, + int height, + int proportion, + int flag, + int border, + wxObject* userData) + : m_kind(Item_None), + m_sizer(NULL), + m_minSize(width, height), // minimal size is the initial size + m_proportion(proportion), + m_border(border), + m_flag(flag), + m_id(wxID_NONE), + m_userData(userData) +{ + ASSERT_VALID_SIZER_FLAGS( m_flag ); + + DoSetSpacer(wxSize(width, height)); } wxSizerItem::~wxSizerItem() { - if (m_userData) - delete m_userData; - if (m_sizer) - delete m_sizer; + delete m_userData; + Free(); +} + +void wxSizerItem::Free() +{ + 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") ); + } + + m_kind = Item_None; +} + +wxSize wxSizerItem::GetSpacer() const +{ + wxSize size; + if ( m_kind == Item_Spacer ) + size = m_spacer->GetSize(); + + return size; } -wxSize wxSizerItem::GetSize() +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; @@ -127,27 +306,97 @@ wxSize wxSizerItem::GetSize() return ret; } +bool wxSizerItem::InformFirstDirection(int direction, int size, int availableOtherDir) +{ + // The size that come here will be including borders. Child items should get it + // without borders. + if( size>0 ) + { + if( direction==wxHORIZONTAL ) + { + if (m_flag & wxWEST) + size -= m_border; + if (m_flag & wxEAST) + size -= m_border; + } + else if( direction==wxVERTICAL ) + { + if (m_flag & wxNORTH) + size -= m_border; + if (m_flag & wxSOUTH) + size -= m_border; + } + } + + bool didUse = false; + // Pass the information along to the held object + if (IsSizer()) + { + didUse = GetSizer()->InformFirstDirection(direction,size,availableOtherDir); + if (didUse) + m_minSize = GetSizer()->CalcMin(); + } + else if (IsWindow()) + { + didUse = GetWindow()->InformFirstDirection(direction,size,availableOtherDir); + if (didUse) + m_minSize = m_window->GetEffectiveMinSize(); + + // This information is useful for items with wxSHAPED flag, since + // we can request an optimal min size for such an item. Even if + // we overwrite the m_minSize member here, we can read it back from + // the owned window (happens automatically). + if( (m_flag & wxSHAPED) && (m_flag & wxEXPAND) && direction ) + { + if( !wxIsNullDouble(m_ratio) ) + { + wxCHECK_MSG( (m_proportion==0), false, _T("Shaped item, non-zero proportion in wxSizerItem::InformFirstDirection()") ); + if( direction==wxHORIZONTAL && !wxIsNullDouble(m_ratio) ) + { + // Clip size so that we don't take too much + if( availableOtherDir>=0 && int(size/m_ratio)-m_minSize.y>availableOtherDir ) + size = int((availableOtherDir+m_minSize.y)*m_ratio); + m_minSize = wxSize(size,int(size/m_ratio)); + } + else if( direction==wxVERTICAL ) + { + // Clip size so that we don't take too much + if( availableOtherDir>=0 && int(size*m_ratio)-m_minSize.x>availableOtherDir ) + size = int((availableOtherDir+m_minSize.x)/m_ratio); + m_minSize = wxSize(int(size*m_ratio),size); + } + didUse = true; + } + } + } + + return didUse; +} + 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 if ( IsWindow() ) + { + // Since the size of the window may change during runtime, we + // should use the current minimal/best size. + m_minSize = m_window->GetEffectiveMinSize(); } -/* - The minimum size of a window should be the - initial size, as saved in m_minSize, not the - current size. + return GetMinSizeWithBorder(); +} - else - if (IsWindow()) - ret = m_window->GetSize(); -*/ - else ret = m_minSize; +wxSize wxSizerItem::GetMinSizeWithBorder() const +{ + wxSize ret = m_minSize; if (m_flag & wxWEST) ret.x += m_border; @@ -161,8 +410,41 @@ 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 + int rwidth = (int) (size.y * m_ratio); + if (rwidth > size.x) + { + // fit horizontally + int rheight = (int) (size.x / m_ratio); + // add vertical space + if (m_flag & wxALIGN_CENTER_VERTICAL) + pos.y += (size.y - rheight) / 2; + else if (m_flag & wxALIGN_BOTTOM) + pos.y += (size.y - rheight); + // use reduced dimensions + size.y =rheight; + } + else if (rwidth < size.x) + { + // add horizontal space + if (m_flag & wxALIGN_CENTER_HORIZONTAL) + pos.x += (size.x - rwidth) / 2; + else if (m_flag & wxALIGN_RIGHT) + pos.x += (size.x - rwidth); + size.x = rwidth; + } + } + + // This is what GetPosition() returns. Since we calculate + // borders afterwards, GetPosition() will be the left/top + // corner of the surrounding border. m_pos = pos; if (m_flag & wxWEST) @@ -183,195 +465,544 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size ) { size.y -= m_border; } - if (m_flag & wxSHAPED) { - // adjust aspect ratio - int rwidth = (int) (size.y * m_ratio); - if (rwidth > size.x) { - // fit horizontally - int rheight = (int) (size.x / m_ratio); - // add vertical space - if (m_flag & wxALIGN_CENTER_VERTICAL) - pos.y += (size.y - rheight) / 2; - else if (m_flag & wxALIGN_BOTTOM) - pos.y += (size.y - rheight); - // use reduced dimensions - size.y =rheight; - } else if (rwidth < size.x) { - // add horizontal space - if (m_flag & wxALIGN_CENTER_HORIZONTAL) - pos.x += (size.x - rwidth) / 2; - else if (m_flag & wxALIGN_RIGHT) - pos.x += (size.x - rwidth); - size.x = rwidth; - } + + if (size.x < 0) + size.x = 0; + if (size.y < 0) + size.y = 0; + + m_rect = wxRect(pos, size); + + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("can't set size of uninitialized sizer item") ); + break; + + case Item_Window: + m_window->SetSize(pos.x, pos.y, size.x, size.y, + wxSIZE_ALLOW_MINUS_ONE); + break; + + case Item_Sizer: + m_sizer->SetDimension(pos, size); + break; + + case Item_Spacer: + m_spacer->SetSize(size); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); } +} - if (IsSizer()) - m_sizer->SetDimension( pos.x, pos.y, size.x, size.y ); +void wxSizerItem::DeleteWindows() +{ + switch ( m_kind ) + { + case Item_None: + case Item_Spacer: + break; + + 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; + + case Item_Sizer: + m_sizer->DeleteWindows(); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } + +} + +void wxSizerItem::Show( bool show ) +{ + switch ( m_kind ) + { + case Item_None: + wxFAIL_MSG( _T("can't show uninitialized sizer item") ); + break; + + case Item_Window: + m_window->Show(show); + break; - if (IsWindow()) - m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE ); + case Item_Sizer: + m_sizer->Show(show); + break; - m_size = size; + case Item_Spacer: + m_spacer->Show(show); + break; + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } } -bool wxSizerItem::IsWindow() +bool wxSizerItem::IsShown() const { - return (m_window != NULL); + if ( m_flag & wxRESERVE_SPACE_EVEN_IF_HIDDEN ) + return true; + + switch ( m_kind ) + { + case Item_None: + // we may be called from CalcMin(), just return false so that we're + // not used + break; + + case Item_Window: + return m_window->IsShown(); + + 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) + { + // Some apps (such as dialog editors) depend on an empty sizer still + // being laid out correctly and reporting the correct size and position. + if (m_sizer->GetChildren().GetCount() == 0) + return true; + + for ( wxSizerItemList::compatibility_iterator + node = m_sizer->GetChildren().GetFirst(); + node; + node = node->GetNext() ) + { + if ( node->GetData()->IsShown() ) + return true; + } + } + return false; + + case Item_Spacer: + return m_spacer->IsShown(); + + case Item_Max: + default: + wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") ); + } + + return false; } -bool wxSizerItem::IsSizer() +#if WXWIN_COMPATIBILITY_2_6 +void wxSizerItem::SetOption( int option ) { - return (m_sizer != NULL); + SetProportion( option ); } -bool wxSizerItem::IsSpacer() +int wxSizerItem::GetOption() const { - return (m_window == NULL) && (m_sizer == NULL); + return GetProportion(); } +#endif // WXWIN_COMPATIBILITY_2_6 + //--------------------------------------------------------------------------- // wxSizer //--------------------------------------------------------------------------- -wxSizer::wxSizer() -{ - m_children.DeleteContents( TRUE ); - m_minSize.x = 0; - m_minSize.y = 0; -} - wxSizer::~wxSizer() { + WX_CLEAR_LIST(wxSizerItemList, m_children); } -void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData ) +wxSizerItem* wxSizer::Insert( size_t index, wxSizerItem *item ) { - m_children.Append( new wxSizerItem( window, option, flag, border, userData ) ); + m_children.Insert( index, item ); + + if ( item->GetWindow() ) + item->GetWindow()->SetContainingSizer( this ); + + if ( item->GetSizer() ) + item->GetSizer()->SetContainingWindow( m_containingWindow ); + + return item; } -void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +void wxSizer::SetContainingWindow(wxWindow *win) { - m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) ); + if ( win == m_containingWindow ) + return; + + m_containingWindow = win; + + // 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 ( sizer ) + { + sizer->SetContainingWindow(win); + } + } } -void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData ) +#if WXWIN_COMPATIBILITY_2_6 +bool wxSizer::Remove( wxWindow *window ) { - m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) ); + return Detach( window ); } +#endif // WXWIN_COMPATIBILITY_2_6 -void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData ) +bool wxSizer::Remove( wxSizer *sizer ) { - m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) ); + wxASSERT_MSG( sizer, _T("Removing NULL sizer") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetSizer() == sizer) + { + delete item; + m_children.Erase( node ); + return true; + } + + node = node->GetNext(); + } + + return false; } -void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +bool wxSizer::Remove( int index ) { - m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) ); + wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(), + false, + _T("Remove index is out of range") ); + + wxSizerItemList::compatibility_iterator node = m_children.Item( index ); + + wxCHECK_MSG( node, false, _T("Failed to find child node") ); + + delete node->GetData(); + m_children.Erase( node ); + + return true; } -void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData ) +bool wxSizer::Detach( wxSizer *sizer ) { - m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) ); + wxASSERT_MSG( sizer, _T("Detaching NULL sizer") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetSizer() == sizer) + { + item->DetachSizer(); + delete item; + m_children.Erase( node ); + return true; + } + node = node->GetNext(); + } + + return false; } -void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData ) +bool wxSizer::Detach( wxWindow *window ) { - m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) ); + wxASSERT_MSG( window, _T("Detaching NULL window") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetWindow() == window) + { + delete item; + m_children.Erase( node ); + return true; + } + node = node->GetNext(); + } + + return false; } -void wxSizer::Insert( int before, wxSizer *sizer, int option, int flag, int border, wxObject* userData ) +bool wxSizer::Detach( int index ) { - m_children.Insert( before, new wxSizerItem( sizer, option, flag, border, userData ) ); + wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(), + false, + _T("Detach index is out of range") ); + + 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() ) + item->DetachSizer(); + + delete item; + m_children.Erase( node ); + return true; } -void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData ) +bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive ) { - m_children.Insert( before, new wxSizerItem( width, height, option, flag, border, userData ) ); + 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->AssignWindow(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::Remove( wxWindow *window ) +bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive ) { - wxASSERT( window ); + wxASSERT_MSG( oldsz, _T("Replacing NULL sizer") ); + wxASSERT_MSG( newsz, _T("Replacing with NULL sizer") ); - wxNode *node = m_children.First(); + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetWindow() == window) + wxSizerItem *item = node->GetData(); + + if (item->GetSizer() == oldsz) + { + item->AssignSizer(newsz); + return true; + } + else if (recursive && item->IsSizer()) { - m_children.DeleteNode( node ); - return TRUE; + if (item->GetSizer()->Replace( oldsz, newsz, true )) + return true; } - node = node->Next(); + + node = node->GetNext(); } - return FALSE; + return false; } -bool wxSizer::Remove( wxSizer *sizer ) +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 ) { - wxASSERT( sizer ); + // First clear the ContainingSizer pointers + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); - wxNode *node = m_children.First(); + if (item->IsWindow()) + item->GetWindow()->SetContainingSizer( NULL ); + node = node->GetNext(); + } + + // Destroy the windows if needed + if (delete_windows) + DeleteWindows(); + + // Now empty the list + WX_CLEAR_LIST(wxSizerItemList, m_children); +} + +void wxSizer::DeleteWindows() +{ + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); while (node) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - if (item->GetSizer() == sizer) + wxSizerItem *item = node->GetData(); + + item->DeleteWindows(); + node = node->GetNext(); + } +} + +wxSize wxSizer::ComputeFittingClientSize(wxWindow *window) +{ + wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" ); + + // take the min size by default and limit it by max size + wxSize size = GetMinClientSize(window); + wxSize sizeMax; + + wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow); + if ( tlw ) + { + // hack for small screen devices where TLWs are always full screen + if ( tlw->IsAlwaysMaximized() ) + { + return tlw->GetClientSize(); + } + + // limit the window to the size of the display it is on + int disp = wxDisplay::GetFromWindow(window); + if ( disp == wxNOT_FOUND ) { - m_children.DeleteNode( node ); - return TRUE; + // or, if we don't know which one it is, of the main one + disp = 0; } - node = node->Next(); + + sizeMax = wxDisplay(disp).GetClientArea().GetSize(); + + // space for decorations and toolbars etc. + sizeMax = tlw->WindowToClientSize(sizeMax); } + else + { + sizeMax = GetMaxClientSize(window); + } + + if ( sizeMax.x != wxDefaultCoord && size.x > sizeMax.x ) + size.x = sizeMax.x; + if ( sizeMax.y != wxDefaultCoord && size.y > sizeMax.y ) + size.y = sizeMax.y; - return FALSE; + return size; } -bool wxSizer::Remove( int pos ) +wxSize wxSizer::ComputeFittingWindowSize(wxWindow *window) { - wxNode *node = m_children.Nth( pos ); - if (!node) return FALSE; + wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" ); - m_children.DeleteNode( node ); + return window->ClientToWindowSize(ComputeFittingClientSize(window)); +} - return TRUE; +wxSize wxSizer::Fit( wxWindow *window ) +{ + wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" ); + + // set client size + window->SetClientSize(ComputeFittingClientSize(window)); + + // return entire size + return window->GetSize(); } -void wxSizer::Fit( wxWindow *window ) +void wxSizer::FitInside( wxWindow *window ) { - window->SetSize( GetMinWindowSize( window ) ); + wxSize size; + if (window->IsTopLevel()) + size = VirtualFitSize( window ); + else + size = GetMinClientSize( window ); + + window->SetVirtualSize( 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(); } void wxSizer::SetSizeHints( wxWindow *window ) { - wxSize size( GetMinWindowSize( window ) ); - window->SetSizeHints( size.x, size.y ); + // Preserve the window's max size hints, but set the + // lower bound according to the sizer calculations. + + // This is equivalent to calling Fit(), except that we need to set + // the size hints _in between_ the two steps performed by Fit + // (1. ComputeFittingClientSize, 2. SetClientSize). That's because + // otherwise SetClientSize() could have no effect if there already are + // size hints in effect that forbid requested client size. + + const wxSize clientSize = ComputeFittingClientSize(window); + + window->SetMinClientSize(clientSize); + window->SetClientSize(clientSize); } -wxSize wxSizer::GetMinWindowSize( wxWindow *window ) +#if WXWIN_COMPATIBILITY_2_8 +void wxSizer::SetVirtualSizeHints( wxWindow *window ) { - 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 ); + FitInside( window ); } +#endif // WXWIN_COMPATIBILITY_2_8 -void wxSizer::SetDimension( int x, int y, int width, int height ) +// 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 +wxSize wxSizer::GetMaxClientSize( wxWindow *window ) const { - m_position.x = x; - m_position.y = y; - m_size.x = width; - m_size.y = height; - CalcMin(); - RecalcSizes(); + return window->WindowToClientSize(window->GetMaxSize()); +} + +wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) ) +{ + return GetMinSize(); // Already returns client size. +} + +wxSize wxSizer::VirtualFitSize( wxWindow *window ) +{ + wxSize size = GetMinClientSize( window ); + wxSize sizeMax = GetMaxClientSize( window ); + + // Limit the size if sizeMax != wxDefaultSize + + if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord ) + size.x = sizeMax.x; + if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord ) + size.y = sizeMax.y; + + return size; } wxSize wxSizer::GetMinSize() @@ -390,128 +1021,346 @@ 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") ); + + // Is it our immediate child? - wxNode *node = m_children.First(); + wxSizerItemList::compatibility_iterator 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; + item->SetMinSize( width, height ); + 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::compatibility_iterator 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::compatibility_iterator 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 ... */ + // Sizers contains the minimal size in them, if not calculated ... item->GetSizer()->DoSetMinSize( width, height ); } else { - /* ... whereas the minimal size of spacers and windows in stored - in the item */ - item->SetInitSize( width, height ); + // ... but the minimal size of spacers and windows is stored via the item + item->SetMinSize( width, height ); + } + + return true; +} + +wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive ) +{ + wxASSERT_MSG( window, _T("GetItem for NULL window") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetWindow() == window) + { + return item; + } + else if (recursive && item->IsSizer()) + { + wxSizerItem *subitem = item->GetSizer()->GetItem( window, true ); + if (subitem) + return subitem; + } + + node = node->GetNext(); + } + + return NULL; +} + +wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive ) +{ + wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") ); + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetSizer() == sizer) + { + 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(); +} + +wxSizerItem* wxSizer::GetItemById( int id, bool recursive ) +{ + // This gets a sizer item by the id of the sizer item + // and NOT the id of a window if the item is a window. + + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetId() == id) + { + return item; + } + else if (recursive && item->IsSizer()) + { + wxSizerItem *subitem = item->GetSizer()->GetItemById( id, true ); + if (subitem) + return subitem; + } + + node = node->GetNext(); + } + + return NULL; +} + +bool wxSizer::Show( wxWindow *window, bool show, bool recursive ) +{ + wxSizerItem *item = GetItem( window, recursive ); + + if ( item ) + { + item->Show( show ); + return true; } - 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; +} + +bool wxSizer::Show( size_t index, bool show) +{ + wxSizerItem *item = GetItem( index ); + + if ( item ) + { + item->Show( show ); + return true; + } + + return false; +} + +void wxSizer::ShowItems( bool show ) +{ + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + node->GetData()->Show( show ); + node = node->GetNext(); + } +} + +bool wxSizer::IsShown( wxWindow *window ) const +{ + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetWindow() == window) + { + return item->IsShown(); + } + node = node->GetNext(); + } + + wxFAIL_MSG( _T("IsShown failed to find sizer item") ); + + return false; +} + +bool wxSizer::IsShown( wxSizer *sizer ) const +{ + wxSizerItemList::compatibility_iterator node = m_children.GetFirst(); + while (node) + { + wxSizerItem *item = node->GetData(); + + if (item->GetSizer() == sizer) + { + return item->IsShown(); + } + node = node->GetNext(); + } + + 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( ( cols == 0 && rows == 0 ) ? 1 : 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( cols == 0 ? 1 : 0 ) + , m_cols( cols ) + , m_vgap( vgap ) + , m_hgap( hgap ) { - m_rows = 0; - m_cols = cols; - m_vgap = vgap; - m_hgap = hgap; } -void wxGridSizer::RecalcSizes() +int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const { - if (m_children.GetCount() == 0) - return; + const int nitems = m_children.GetCount(); + if ( m_cols && m_rows ) + { + // if both rows and columns are specified by user, use the provided + // values even if we don't have enough items but check that we don't + // have too many of them as this is going to result in problems later + ncols = m_cols; + nrows = m_rows; + + wxASSERT_MSG( ncols*nrows >= nitems, "too many items in grid sizer" ); + } + else if ( m_cols ) + { + ncols = m_cols; + nrows = (nitems + m_cols - 1) / m_cols; + } + else if ( m_rows ) + { + ncols = (nitems + m_rows - 1) / m_rows; + nrows = m_rows; + } + else // 0 columns, 0 rows? + { + wxFAIL_MSG( _T("grid sizer must have either rows or columns fixed") ); + + nrows = + ncols = 0; + } - int nitems = m_children.GetCount(); - int nrows = m_rows; - int ncols = m_cols; + return nitems; +} - if (ncols > 0) - nrows = (nitems + ncols-1) / ncols; - else - ncols = (nitems + nrows-1) / nrows; +void wxGridSizer::RecalcSizes() +{ + int nitems, nrows, ncols; + if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 ) + return; wxSize sz( GetSize() ); wxPoint pt( GetPosition() ); @@ -528,10 +1377,11 @@ void wxGridSizer::RecalcSizes() int i = r * ncols + c; if (i < nitems) { - wxNode *node = m_children.Nth( i ); - wxASSERT( node ); + wxSizerItemList::compatibility_iterator node = m_children.Item( i ); - SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h); + wxASSERT_MSG( node, _T("Failed to find SizerItemList node") ); + + SetItemBounds( node->GetData(), x, y, w, h); } y = y + h + m_vgap; } @@ -541,41 +1391,63 @@ void wxGridSizer::RecalcSizes() wxSize wxGridSizer::CalcMin() { - if (m_children.GetCount() == 0) - return wxSize(10,10); - - int nitems = m_children.GetCount(); - int nrows = m_rows; - int ncols = m_cols; + int nrows, ncols; + if ( CalcRowsCols(nrows, ncols) == 0 ) + return wxSize(); - if (ncols > 0) - nrows = (nitems + ncols-1) / ncols; - else - ncols = (nitems + nrows-1) / nrows; - - /* Find the max width and height for any component */ + // Find the max width and height for any component int w = 0; int h = 0; - wxNode *node = m_children.First(); + wxSizerItemList::compatibility_iterator 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(); + } + + // In case we have a nested sizer with a two step algo , give it + // a chance to adjust to that (we give it width component) + node = m_children.GetFirst(); + bool didChangeMinSize = false; + while (node) + { + wxSizerItem *item = node->GetData(); + didChangeMinSize |= item->InformFirstDirection( wxHORIZONTAL, w, -1 ); + + node = node->GetNext(); + } + + // And redo iteration in case min size changed + if( didChangeMinSize ) + { + node = m_children.GetFirst(); + w = h = 0; + while (node) + { + wxSizerItem *item = node->GetData(); + wxSize sz( item->GetMinSizeWithBorder() ); + + w = wxMax( w, sz.x ); + h = wxMax( h, sz.y ); + + 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 ) { wxPoint pt( x,y ); - wxSize sz( item->CalcMin() ); + wxSize sz( item->GetMinSizeWithBorder() ); int flag = item->GetFlag(); if ((flag & wxEXPAND) || (flag & wxSHAPED)) @@ -611,347 +1483,603 @@ 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() +void wxFlexGridSizer::RecalcSizes() { - if (m_rowHeights) - delete[] m_rowHeights; - if (m_colWidths) - delete[] m_colWidths; - - if (m_children.GetCount() == 0) + int nrows, ncols; + if ( !CalcRowsCols(nrows, ncols) ) return; - int nitems = m_children.GetCount(); - int nrows = m_rows; - int ncols = m_cols; + const wxPoint pt(GetPosition()); + const wxSize sz(GetSize()); - if (ncols > 0) - nrows = (nitems + ncols-1) / ncols; - else - ncols = (nitems + nrows-1) / nrows; + AdjustForGrowables(sz); + + wxSizerItemList::const_iterator i = m_children.begin(); + const wxSizerItemList::const_iterator end = m_children.end(); + + int y = 0; + for ( int r = 0; r < nrows; r++ ) + { + if ( m_rowHeights[r] == -1 ) + { + // this row is entirely hidden, skip it + for ( int c = 0; c < ncols; c++ ) + { + if ( i == end ) + return; + + ++i; + } + + continue; + } + + const int hrow = m_rowHeights[r]; + int h = sz.y - y; // max remaining height, don't overflow it + if ( hrow < h ) + h = hrow; + + int x = 0; + for ( int c = 0; c < ncols && i != end; c++, ++i ) + { + const int wcol = m_colWidths[c]; + + if ( wcol == -1 ) + continue; + + int w = sz.x - x; // max possible value, ensure we don't overflow + if ( wcol < w ) + w = wcol; + + SetItemBounds(*i, pt.x + x, pt.y + y, w, h); + + x += wcol + m_hgap; + } - m_rowHeights = new int[nrows]; - m_colWidths = new int[ncols]; + if ( i == end ) + return; - for (int col = 0; col < ncols; col++) - m_colWidths[ col ] = 0; - for (int row = 0; row < nrows; row++) - m_rowHeights[ row ] = 0; + y += hrow + m_vgap; + } } -void wxFlexGridSizer::RecalcSizes() +// helper function used in CalcMin() to sum up the sizes of non-hidden items +static int SumArraySizes(const wxArrayInt& sizes, int gap) { - if (m_children.GetCount() == 0) - return; + // Sum total minimum size, including gaps between rows/columns. + // -1 is used as a magic number meaning empty row/column. + int total = 0; - int nitems = m_children.GetCount(); - int nrows = m_rows; - int ncols = m_cols; + const size_t count = sizes.size(); + for ( size_t n = 0; n < count; n++ ) + { + if ( sizes[n] != -1 ) + { + if ( total ) + total += gap; // separate from the previous column - if (ncols > 0) - nrows = (nitems + ncols-1) / ncols; - else - ncols = (nitems + nrows-1) / nrows; + total += sizes[n]; + } + } - wxSize sz( GetSize() ); - wxSize minsz( CalcMin() ); - wxPoint pt( GetPosition() ); - int delta; - size_t idx; + return total; +} - if ((m_growableRows.GetCount() > 0) && (sz.y > minsz.y)) +void wxFlexGridSizer::FindWidthsAndHeights(int nrows, int ncols) +{ + // We have to recalculate the sizes in case the item minimum size has + // changed since the previous layout, or the item has been hidden using + // wxSizer::Show(). If all the items in a row/column are hidden, the final + // dimension of the row/column will be -1, indicating that the column + // itself is hidden. + m_rowHeights.assign(nrows, -1); + m_colWidths.assign(ncols, -1); + + // n is the index of the item in left-to-right top-to-bottom order + size_t n = 0; + for ( wxSizerItemList::iterator i = m_children.begin(); + i != m_children.end(); + ++i, ++n ) { - delta = (sz.y - minsz.y) / m_growableRows.GetCount(); - for (idx = 0; idx < m_growableRows.GetCount(); idx++) - m_rowHeights[ m_growableRows[idx] ] += delta; + wxSizerItem * const item = *i; + if ( item->IsShown() ) + { + // NOTE: Not doing the calculation here, this is just + // for finding max values. + const wxSize sz(item->GetMinSizeWithBorder()); + + const int row = n / ncols; + const int col = n % ncols; + + if ( sz.y > m_rowHeights[row] ) + m_rowHeights[row] = sz.y; + if ( sz.x > m_colWidths[col] ) + m_colWidths[col] = sz.x; + } } - if ((m_growableCols.GetCount() > 0) && (sz.x > minsz.x)) + AdjustForFlexDirection(); + + m_calculatedMinSize = wxSize(SumArraySizes(m_colWidths, m_hgap), + SumArraySizes(m_rowHeights, m_vgap)); +} + +wxSize wxFlexGridSizer::CalcMin() +{ + int nrows, + ncols; + + // Number of rows/columns can change as items are added or removed. + if ( !CalcRowsCols(nrows, ncols) ) + return wxSize(); + + + // We have to recalculate the sizes in case the item minimum size has + // changed since the previous layout, or the item has been hidden using + // wxSizer::Show(). If all the items in a row/column are hidden, the final + // dimension of the row/column will be -1, indicating that the column + // itself is hidden. + m_rowHeights.assign(nrows, -1); + m_colWidths.assign(ncols, -1); + + for ( wxSizerItemList::iterator i = m_children.begin(); + i != m_children.end(); + ++i) { - delta = (sz.x - minsz.x) / m_growableCols.GetCount(); - for (idx = 0; idx < m_growableCols.GetCount(); idx++) - m_colWidths[ m_growableCols[idx] ] += delta; + wxSizerItem * const item = *i; + if ( item->IsShown() ) + { + item->CalcMin(); + } } - sz = wxSize( pt.x + sz.x, pt.y + sz.y ); + // The stage of looking for max values in each row/column has been + // made a separate function, since it's reused in AdjustForGrowables. + FindWidthsAndHeights(nrows,ncols); - int x = pt.x; - for (int c = 0; c < ncols; c++) + 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 ) { - int y = pt.y; - for (int r = 0; r < nrows; r++) - { - int i = r * ncols + c; - if (i < nitems) - { - wxNode *node = m_children.Nth( i ); - wxASSERT( node ); + // select the array corresponding to the direction in which we do *not* + // resize flexibly + wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths + : m_rowHeights; - int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) ); - int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) ); + const size_t count = array.GetCount(); - SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h); - } - y = y + m_rowHeights[r] + m_vgap; + // find the largest value in this array + size_t n; + int 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 ) + { + // don't touch hidden rows + if ( array[n] != -1 ) + array[n] = largest; } - x = x + m_colWidths[c] + m_hgap; } } -wxSize wxFlexGridSizer::CalcMin() +// helper of AdjustForGrowables() which is called for rows/columns separately +// +// parameters: +// delta: the extra space, we do nothing unless it's positive +// growable: indices or growable rows/cols in sizes array +// sizes: the height/widths of rows/cols to adjust +// proportions: proportions of the growable rows/cols or NULL if they all +// should be assumed to have proportion of 1 +static void +DoAdjustForGrowables(int delta, + const wxArrayInt& growable, + wxArrayInt& sizes, + const wxArrayInt *proportions) { - if (m_children.GetCount() == 0) - return wxSize(10,10); + if ( delta <= 0 ) + return; - int nitems = m_children.GetCount(); - int nrows = m_rows; - int ncols = m_cols; + // total sum of proportions of all non-hidden rows + int sum_proportions = 0; - if (ncols > 0) - nrows = (nitems + ncols-1) / ncols; - else - ncols = (nitems + nrows-1) / nrows; + // number of currently shown growable rows + int num = 0; + + const int max_idx = sizes.size(); - CreateArrays(); + const size_t count = growable.size(); + size_t idx; + for ( idx = 0; idx < count; 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 ( growable[idx] >= max_idx ) + continue; + + // If all items in a row/column are hidden, that row/column will + // have a dimension of -1. This causes the row/column to be + // hidden completely. + if ( sizes[growable[idx]] == -1 ) + continue; + + if ( proportions ) + sum_proportions += (*proportions)[idx]; + + num++; + } - int col; - int row; + if ( !num ) + return; - int i = 0; - wxNode *node = m_children.First(); - while (node) + // the remaining extra free space, adjusted during each iteration + for ( idx = 0; idx < count; idx++ ) { - wxSizerItem *item = (wxSizerItem*)node->Data(); - wxSize sz( item->CalcMin() ); - row = i / ncols; - col = i % ncols; - m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] ); - m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] ); + if ( growable[idx] >= max_idx ) + continue; + + if ( sizes[ growable[idx] ] == -1 ) + continue; - node = node->Next(); - i++; + int cur_delta; + if ( sum_proportions == 0 ) + { + // no growable rows -- divide extra space evenly among all + cur_delta = delta/num; + num--; + } + else // allocate extra space proportionally + { + const int cur_prop = (*proportions)[idx]; + cur_delta = (delta*cur_prop)/sum_proportions; + sum_proportions -= cur_prop; + } + + sizes[growable[idx]] += cur_delta; + delta -= cur_delta; } +} - int width = 0; - for (col = 0; col < ncols; col++) - width += m_colWidths[ col ]; +void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz) +{ + if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) ) + { + DoAdjustForGrowables + ( + sz.x - m_calculatedMinSize.x, + m_growableCols, + m_colWidths, + m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions + : NULL + ); + + // This gives nested objects that benefit from knowing one size + // component in advance the chance to use that. + bool didAdjustMinSize = false; + int nrows, ncols; + CalcRowsCols(nrows, ncols); + + // Iterate over all items and inform about column width + size_t n = 0; + for ( wxSizerItemList::iterator i = m_children.begin(); + i != m_children.end(); + ++i, ++n ) + { + const int col = n % ncols; + didAdjustMinSize |= (*i)->InformFirstDirection(wxHORIZONTAL, m_colWidths[col], sz.y - m_calculatedMinSize.y); + } - int height = 0; - for (row = 0; row < nrows; row++) - height += m_rowHeights[ row ]; + // Only redo if info was actually used + if( didAdjustMinSize ) + { + DoAdjustForGrowables + ( + sz.x - m_calculatedMinSize.x, + m_growableCols, + m_colWidths, + m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions + : NULL + ); + } + } - return wxSize( width + (ncols-1) * m_hgap, - height + (nrows-1) * m_vgap); + if ( (m_flexDirection & wxVERTICAL) || (m_growMode != wxFLEX_GROWMODE_NONE) ) + { + // pass NULL instead of proportions if the grow mode is ALL as we + // should treat all rows as having proportion of 1 then + DoAdjustForGrowables + ( + sz.y - m_calculatedMinSize.y, + m_growableRows, + m_rowHeights, + m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableRowsProportions + : NULL + ); + } } -void wxFlexGridSizer::AddGrowableRow( size_t idx ) +bool wxFlexGridSizer::IsRowGrowable( size_t idx ) { - m_growableRows.Add( idx ); + return m_growableRows.Index( idx ) != wxNOT_FOUND; } -void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) ) +bool wxFlexGridSizer::IsColGrowable( size_t idx ) { + return m_growableCols.Index( idx ) != wxNOT_FOUND; } -void wxFlexGridSizer::AddGrowableCol( size_t idx ) +void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion ) { + int nrows, ncols; + CalcRowsCols(nrows, ncols); + wxCHECK_RET( idx < (size_t)nrows, "invalid row index" ); + + wxASSERT_MSG( !IsRowGrowable( idx ), + "AddGrowableRow() called for growable row" ); + m_growableRows.Add( idx ); + m_growableRowsProportions.Add( proportion ); +} + +void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion ) +{ + int nrows, ncols; + CalcRowsCols(nrows, ncols); + wxCHECK_RET( idx < (size_t)ncols, "invalid column index" ); + + wxASSERT_MSG( !IsColGrowable( idx ), + "AddGrowableCol() called for growable column" ); 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") ); } -//--------------------------------------------------------------------------- -// wxBoxSizer -//--------------------------------------------------------------------------- +void wxFlexGridSizer::RemoveGrowableCol( size_t idx ) +{ + DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions); +} -wxBoxSizer::wxBoxSizer( int orient ) +void wxFlexGridSizer::RemoveGrowableRow( size_t idx ) { - m_orient = orient; + DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions); } +//--------------------------------------------------------------------------- +// wxBoxSizer +//--------------------------------------------------------------------------- + void wxBoxSizer::RecalcSizes() { - if (m_children.GetCount() == 0) + if ( m_children.empty() ) return; - int delta = 0; - int extra = 0; - if (m_stretchable) + const wxCoord totalMinorSize = GetSizeInMinorDir(m_size); + + // the amount of free space which we should redistribute among the + // stretchable items (i.e. those with non zero proportion) + int delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize); + + + // Inform child items about the size in minor direction, that can + // change how much free space we have in major dir and how to distribute it. + int majorMinSum = 0; + wxSizerItemList::const_iterator i ; + for ( i = m_children.begin(); + i != m_children.end(); + ++i ) { - if (m_orient == wxHORIZONTAL) - { - delta = (m_size.x - m_fixedWidth) / m_stretchable; - extra = (m_size.x - m_fixedWidth) % m_stretchable; - } - else + wxSizerItem * const item = *i; + + if ( !item->IsShown() ) + continue; + + wxSize szMinPrev = item->GetMinSizeWithBorder(); + item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta); + wxSize szMin = item->GetMinSizeWithBorder(); + int deltaChange = GetSizeInMajorDir(szMin-szMinPrev); + if( deltaChange ) { - delta = (m_size.y - m_fixedHeight) / m_stretchable; - extra = (m_size.y - m_fixedHeight) % m_stretchable; + // Since we passed available space along to the item, it should not + // take too much, so delta should not become negative. + delta -= deltaChange; } + majorMinSum += GetSizeInMajorDir(item->GetMinSizeWithBorder()); } + // And update our min size + SizeInMajorDir(m_minSize) = majorMinSum; - wxPoint pt( m_position ); - wxNode *node = m_children.GetFirst(); - while (node) + // might have a new delta now + delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize); + + // the position at which we put the next child + wxPoint pt(m_position); + + int totalProportion = m_totalProportion; + for ( i = m_children.begin(); + i != m_children.end(); + ++i ) { - wxSizerItem *item = (wxSizerItem*) node->Data(); + wxSizerItem * const item = *i; - int weight = 1; - if (item->GetOption()) - weight = item->GetOption(); + if ( !item->IsShown() ) + continue; - wxSize size( item->CalcMin() ); + const wxSize sizeThis(item->GetMinSizeWithBorder()); - if (m_orient == wxVERTICAL) + // adjust the size in the major direction using the proportion + wxCoord majorSize = GetSizeInMajorDir(sizeThis); + + // if there is not enough space, don't try to distribute negative space + // among the children, this would result in overlapping windows which + // we don't want + if ( delta > 0 ) { - wxCoord height = size.y; - if (item->GetOption()) + const int propItem = item->GetProportion(); + if ( propItem ) { - height = (delta * weight) + extra; - extra = 0; // only the first item will get the remainder as extra size - } + const int deltaItem = (delta * propItem) / totalProportion; - wxPoint child_pos( pt ); - wxSize child_size( wxSize( size.x, height) ); + majorSize += deltaItem; - if (item->GetFlag() & (wxEXPAND | wxSHAPED)) - child_size.x = m_size.x; - else if (item->GetFlag() & wxALIGN_RIGHT) - child_pos.x += m_size.x - size.x; - else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_HORIZONTAL)) - // XXX wxCENTER is added for backward compatibility; - // wxALIGN_CENTER should be used in new code - child_pos.x += (m_size.x - size.x) / 2; + delta -= deltaItem; + totalProportion -= propItem; + } + } - item->SetDimension( child_pos, child_size ); - pt.y += height; + // apply the alignment in the minor direction + wxPoint posChild(pt); + + wxCoord minorSize = GetSizeInMinorDir(sizeThis); + const int flag = item->GetFlag(); + if ( flag & (wxEXPAND | wxSHAPED) ) + { + minorSize = totalMinorSize; } - else + else if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) ) { - wxCoord width = size.x; - if (item->GetOption()) - { - width = (delta * weight) + extra; - extra = 0; // only the first item will get the remainder as extra size - } - - wxPoint child_pos( pt ); - wxSize child_size( wxSize(width, size.y) ); - - if (item->GetFlag() & (wxEXPAND | wxSHAPED)) - child_size.y = m_size.y; - else if (item->GetFlag() & wxALIGN_BOTTOM) - child_pos.y += m_size.y - size.y; - else if (item->GetFlag() & (wxCENTER | wxALIGN_CENTER_VERTICAL)) - // XXX wxCENTER is added for backward compatibility; - // wxALIGN_CENTER should be used in new code - child_pos.y += (m_size.y - size.y) / 2; + PosInMinorDir(posChild) += totalMinorSize - minorSize; + } + // NB: wxCENTRE is used here only for backwards compatibility, + // wxALIGN_CENTRE should be used in new code + else if ( flag & (wxCENTER | (IsVertical() ? wxALIGN_CENTRE_HORIZONTAL : wxALIGN_CENTRE_VERTICAL))) + { + PosInMinorDir(posChild) += (totalMinorSize - minorSize) / 2; + } - item->SetDimension( child_pos, child_size ); - pt.x += width; + // apply RTL adjustment for horizontal sizers: + if ( !IsVertical() && m_containingWindow ) + { + posChild.x = m_containingWindow->AdjustForLayoutDirection + ( + posChild.x, + majorSize, + m_size.x + ); } - node = node->Next(); + // finally set size of this child and advance to the next one + item->SetDimension(posChild, SizeFromMajorMinor(majorSize, minorSize)); + + PosInMajorDir(pt) += majorSize; } } wxSize wxBoxSizer::CalcMin() { - if (m_children.GetCount() == 0) - return wxSize(10,10); - - m_stretchable = 0; - m_minWidth = 0; - m_minHeight = 0; - m_fixedWidth = 0; - m_fixedHeight = 0; + m_totalProportion = 0; + m_minSize = wxSize(0, 0); - wxNode *node = m_children.GetFirst(); - while (node) + // calculate the minimal sizes for all items and count sum of proportions + for ( wxSizerItemList::const_iterator i = m_children.begin(); + i != m_children.end(); + ++i ) { - wxSizerItem *item = (wxSizerItem*) node->Data(); - - m_stretchable += item->GetOption(); - - wxSize size( item->CalcMin() ); + wxSizerItem * const item = *i; - 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 ); - } + if ( !item->IsShown() ) + continue; - if (item->GetOption() == 0) - { - if (m_orient == wxVERTICAL) - { - m_fixedHeight += size.y; - m_fixedWidth = wxMax( m_fixedWidth, size.x ); - } - else - { - m_fixedWidth += size.x; - m_fixedHeight = wxMax( m_fixedHeight, size.y ); - } - } + const wxSize sizeMinThis = item->CalcMin(); + SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis); + if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) ) + SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis); - node = node->Next(); + m_totalProportion += item->GetProportion(); } - return wxSize( m_minWidth, m_minHeight ); + return m_minSize; } //--------------------------------------------------------------------------- // wxStaticBoxSizer //--------------------------------------------------------------------------- +#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; + // 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, + 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 + box->GetBordersForSizer(borderTop, borderOther); } void wxStaticBoxSizer::RecalcSizes() { - // this will have to be done platform by platform - // as there is no way to guess the thickness of - // a wxStaticBox border - int top_border = 15; - if (m_staticBox->GetLabel().IsEmpty()) top_border = 5; - int other_border = 5; + int top_border, other_border; + GetStaticBoxBorders(m_staticBox, &top_border, &other_border); m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y ); @@ -970,13 +2098,8 @@ void wxStaticBoxSizer::RecalcSizes() wxSize wxStaticBoxSizer::CalcMin() { - // This will have to be done platform by platform - // as there is no way to guess the thickness of - // a wxStaticBox border. - - int top_border = 15; - if (m_staticBox->GetLabel().IsEmpty()) top_border = 5; - int other_border = 5; + int top_border, other_border; + GetStaticBoxBorders(m_staticBox, &top_border, &other_border); wxSize ret( wxBoxSizer::CalcMin() ); ret.x += 2*other_border; @@ -985,66 +2108,211 @@ wxSize wxStaticBoxSizer::CalcMin() return ret; } -//--------------------------------------------------------------------------- -// wxNotebookSizer -//--------------------------------------------------------------------------- - -#if wxUSE_NOTEBOOK +void wxStaticBoxSizer::ShowItems( bool show ) +{ + m_staticBox->Show( show ); + wxBoxSizer::ShowItems( show ); +} -wxNotebookSizer::wxNotebookSizer( wxNotebook *nb ) +bool wxStaticBoxSizer::Detach( wxWindow *window ) { - wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") ); + // 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; + } - m_notebook = nb; + return wxSizer::Detach( window ); } -void wxNotebookSizer::RecalcSizes() +#endif // wxUSE_STATBOX + +#if wxUSE_BUTTON + +wxStdDialogButtonSizer::wxStdDialogButtonSizer() + : wxBoxSizer(wxHORIZONTAL) { - m_notebook->SetSize( m_position.x, m_position.y, m_size.x, m_size.y ); + // 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; } -wxSize wxNotebookSizer::CalcMin() +void wxStdDialogButtonSizer::AddButton(wxButton *mybutton) { - // This will have to be done platform by platform - // as there is no way to guess the thickness of - // the wxNotebook tabs and border. - - int borderX = 5; - int borderY = 5; - if ((m_notebook->HasFlag(wxNB_RIGHT)) || - (m_notebook->HasFlag(wxNB_LEFT))) + switch (mybutton->GetId()) { - borderX += 90; // improvements later.. - } - else - { - borderY += 40; // improvements later.. + 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: + case wxID_CLOSE: + m_buttonCancel = mybutton; + break; + case wxID_HELP: + case wxID_CONTEXT_HELP: + m_buttonHelp = mybutton; + break; + default: + break; } +} - if (m_notebook->GetChildren().GetCount() == 0) - return wxSize(borderX + 10, borderY + 10); +void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button ) +{ + m_buttonAffirmative = button; +} + +void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button ) +{ + m_buttonNegative = button; +} - int maxX = 0; - int maxY = 0; +void wxStdDialogButtonSizer::SetCancelButton( wxButton *button ) +{ + m_buttonCancel = button; +} - wxWindowList::Node *node = m_notebook->GetChildren().GetFirst(); - while (node) - { - wxWindow *item = node->GetData(); - wxSizer *itemsizer = item->GetSizer(); +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); + } - if (itemsizer) - { - wxSize subsize( itemsizer->CalcMin() ); + // extra whitespace between help/negative and cancel/ok buttons + Add(0, 0, 1, wxEXPAND, 0); - if (subsize.x > maxX) maxX = subsize.x; - if (subsize.y > maxY) maxY = subsize.y; + if (m_buttonCancel){ + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6); + // Cancel or help should be default + // m_buttonCancel->SetDefaultButton(); } - node = node->GetNext(); - } + // 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")); + if (m_buttonNegative) + 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); + } + + // according to HIG, in explicit apply windows the order is: + // [ Help Apply Cancel OK ] + if (m_buttonApply) + Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + + if (m_buttonCancel){ + Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3); + // Cancel or help should be default + // m_buttonCancel->SetDefaultButton(); + } + + if (m_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); - return wxSize( borderX + maxX, borderY + maxY ); + 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_NOTEBOOK +#endif // wxUSE_BUTTON