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)
+ for ( wxSizerItemList::compatibility_iterator
+ node = m_sizer->GetChildren().GetFirst();
+ node;
+ node = node->GetNext() )
{
- // 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)
+ if ( node->GetData()->IsShown() )
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();
wxSizerItem *item = node->GetData();
node->SetData(newitem);
+
+ if (item->IsWindow() && item->GetWindow())
+ item->GetWindow()->SetContainingSizer(NULL);
+
delete item;
return true;
m_vgap( vgap ),
m_hgap( hgap )
{
+ wxASSERT(cols >= 0);
}
wxGridSizer::wxGridSizer( int cols, const wxSize& gap )
m_vgap( gap.GetHeight() ),
m_hgap( gap.GetWidth() )
{
+ wxASSERT(cols >= 0);
}
wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
m_vgap( vgap ),
m_hgap( hgap )
{
+ wxASSERT(rows >= 0 && cols >= 0);
}
wxGridSizer::wxGridSizer( int rows, int cols, const wxSize& gap )
m_vgap( gap.GetHeight() ),
m_hgap( gap.GetWidth() )
{
+ wxASSERT(rows >= 0 && cols >= 0);
}
wxSizerItem *wxGridSizer::DoInsert(size_t index, wxSizerItem *item)
// Check for the degenerated case when we don't have enough space for even
// the min sizes of all the items: in this case we really can't do much
- // more than to to allocate the min size to as many of fixed size items as
+ // more than to allocate the min size to as many of fixed size items as
// possible (on the assumption that variable size items such as text zones
// or list boxes may use scrollbars to show their content even if their
// size is less than min size but that fixed size items such as buttons
if ( majorSizes[n] != wxDefaultCoord )
continue;
- const wxCoord
- minMajor = GetSizeInMajorDir(item->GetMinSizeWithBorder());
+ wxCoord minMajor = GetSizeInMajorDir(item->GetMinSizeWithBorder());
+
+ // it doesn't make sense for min size to be negative but right now
+ // it's possible to create e.g. a spacer with (-1, 10) as size and
+ // people do it in their code apparently (see #11842) so ensure
+ // that we don't use this -1 as real min size as it conflicts with
+ // the meaning we use for it here and negative min sizes just don't
+ // make sense anyhow (which is why it might be a better idea to
+ // deal with them at wxSizerItem level in the future but for now
+ // this is the minimal fix for the bug)
+ if ( minMajor < 0 )
+ minMajor = 0;
+
const int propItem = item->GetProportion();
if ( propItem )
{
m_totalProportion = 0;
m_minSize = wxSize(0, 0);
- // calculate the minimal sizes for all items and count sum of proportions
+ // The minimal size for the sizer should be big enough to allocate its
+ // element at least its minimal size but also, and this is the non trivial
+ // part, to respect the children proportion. To satisfy the latter
+ // condition we must find the greatest min-size-to-proportion ratio for all
+ // elements with non-zero proportion.
+ float maxMinSizeToProp = 0.;
for ( wxSizerItemList::const_iterator i = m_children.begin();
i != m_children.end();
++i )
continue;
const wxSize sizeMinThis = item->CalcMin();
- SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
+ if ( const int propThis = item->GetProportion() )
+ {
+ float minSizeToProp = GetSizeInMajorDir(sizeMinThis);
+ minSizeToProp /= propThis;
+
+ if ( minSizeToProp > maxMinSizeToProp )
+ maxMinSizeToProp = minSizeToProp;
+
+ m_totalProportion += item->GetProportion();
+ }
+ else // fixed size item
+ {
+ // Just account for its size directly
+ SizeInMajorDir(m_minSize) += GetSizeInMajorDir(sizeMinThis);
+ }
+
+ // In the transversal direction we just need to find the maximum.
if ( GetSizeInMinorDir(sizeMinThis) > GetSizeInMinorDir(m_minSize) )
SizeInMinorDir(m_minSize) = GetSizeInMinorDir(sizeMinThis);
-
- m_totalProportion += item->GetProportion();
}
+ // Using the max ratio ensures that the min size is big enough for all
+ // items to have their min size and satisfy the proportions among them.
+ SizeInMajorDir(m_minSize) += (int)(maxMinSizeToProp*m_totalProportion);
+
return m_minSize;
}
// in the wxBoxSizer::RecalcSizes() call below using coordinates relative
// to the top-left corner of the staticbox:
m_position.x = m_position.y = 0;
+#elif defined(__WXOSX__) && wxOSX_USE_COCOA
+ // the distance from the 'inner' content view to the embedded controls
+ m_position.x = m_position.y = 10;
#else
// if the wxStaticBox has childrens, then these windows must be placed
// by the wxBoxSizer::RecalcSizes() call below using coordinates relative
// Extra space around and at the right
Add(12, 40);
#elif defined(__WXGTK20__)
- Add(0, 0, 0, wxLEFT, 9);
+ // http://library.gnome.org/devel/hig-book/stable/windows-alert.html.en
+ // says that the correct button order is
+ //
+ // [Help] [Alternative] [Cancel] [Affirmative]
+
+ // Flags ensuring that margins between the buttons are 6 pixels.
+ const wxSizerFlags
+ flagsBtn = wxSizerFlags().Centre().Border(wxLEFT | wxRIGHT, 3);
+
+ // Margin around the entire sizer button should be 12.
+ AddSpacer(9);
+
if (m_buttonHelp)
- Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+ Add(m_buttonHelp, flagsBtn);
- // extra whitespace between help and cancel/ok buttons
- Add(0, 0, 1, wxEXPAND, 0);
+ // Align the rest of the buttons to the right.
+ AddStretchSpacer();
- if (m_buttonNegative){
- Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
- }
+ if (m_buttonNegative)
+ Add(m_buttonNegative, flagsBtn);
- // 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);
+ Add(m_buttonApply, flagsBtn);
- if (m_buttonCancel){
- Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
- // Cancel or help should be default
- // m_buttonCancel->SetDefaultButton();
- }
+ if (m_buttonCancel)
+ Add(m_buttonCancel, flagsBtn);
if (m_buttonAffirmative)
- Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+ Add(m_buttonAffirmative, flagsBtn);
+
+ // Ensure that the right margin is 12 as well.
+ AddSpacer(9);
#elif defined(__WXMSW__)
// Windows
projects / wxWidgets.git / blobdiff