// Created:
// RCS-ID: $Id$
// Copyright: (c) Robin Dunn, Robert Roebling
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#include "wx/sizer.h"
#include "wx/utils.h"
#include "wx/statbox.h"
-#include "wx/notebook.h"
#include "wx/listimpl.cpp"
+#if WXWIN_COMPATIBILITY_2_4
+ #include "wx/notebook.h"
+#endif
#ifdef __WXMAC__
# include "wx/mac/uma.h"
#if wxUSE_STATBOX
IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
#endif
-#if wxUSE_BOOKCTRL
-IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
-#if wxUSE_NOTEBOOK
-IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
-#endif // wxUSE_NOTEBOOK
-#endif // wxUSE_BOOKCTRL
WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
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 )
// aspect ratio calculated from initial size
SetRatio( m_minSize );
+ if (flag & wxFIXED_MINSIZE)
+ window->SetMinSize(window->GetSize());
+ m_minSize = window->GetSize();
+
// m_size is calculated later
}
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);
}
- else
+ else if ( IsWindow() )
{
- if ( IsWindow() && !(m_flag & wxFIXED_MINSIZE) )
- {
- // Since the size of the window may change during runtime, we
- // should use the current minimal size. If there is a MinSize,
- // use it, otherwise use the BestSize.
- wxSize min = m_window->GetMinSize();
- wxSize best = m_window->GetBestSize();
- if (min.x == -1) min.x = best.x;
- if (min.y == -1) min.y = best.y;
- m_minSize = min;
- }
-
- 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)
ret.y += m_border;
if (m_flag & wxSOUTH)
ret.y += m_border;
-
+
return ret;
}
+
void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
if (m_flag & wxSHAPED)
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();
}
}
else
{
- // ... but the minimal size of spacers and windows in stored in them
+ // ... but the minimal size of spacers and windows is stored via the item
item->SetMinSize( width, height );
}
void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
{
wxPoint pt( x,y );
- wxSize sz( item->CalcMin() );
+ wxSize sz( item->GetMinSizeWithBorder() );
int flag = item->GetFlag();
if ((flag & wxEXPAND) || (flag & wxSHAPED))
{
if (flag & wxALIGN_CENTER_HORIZONTAL)
{
- pt.x = x + (w - sz.x - m_hgap) / 2;
+ pt.x = x + (w - sz.x) / 2;
}
else if (flag & wxALIGN_RIGHT)
{
- pt.x = x + (w - sz.x - m_hgap);
+ pt.x = x + (w - sz.x);
}
if (flag & wxALIGN_CENTER_VERTICAL)
{
- pt.y = y + (h - sz.y - m_vgap) / 2;
+ pt.y = y + (h - sz.y) / 2;
}
else if (flag & wxALIGN_BOTTOM)
{
- pt.y = y + (h - sz.y - m_vgap);
+ pt.y = y + (h - sz.y);
}
}
wxPoint pt( GetPosition() );
wxSize sz( GetSize() );
- wxSize minsz( CalcMin() );
- AdjustForGrowables(sz, minsz, nrows, ncols);
+ AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
sz = wxSize( pt.x + sz.x, pt.y + sz.y );
if ( m_rowHeights[ row ] != -1 )
height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
- return wxSize( width, height );
+ m_calculatedMinSize = wxSize( width, height );
+ return m_calculatedMinSize;
}
void wxFlexGridSizer::AdjustForFlexDirection()
if (item->IsShown())
{
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
if (m_orient == wxVERTICAL)
{
m_fixedWidth = 0;
m_fixedHeight = 0;
+ // precalc item minsizes and count proportions
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
+ if (item->IsShown())
+ item->CalcMin(); // result is stored in the item
+
if (item->IsShown() && item->GetProportion() != 0)
m_stretchable += item->GetProportion();
if (item->IsShown() && item->GetProportion() != 0)
{
int stretch = item->GetProportion();
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
int minSize;
// Integer division rounded up is (a + b - 1) / b
if (item->IsShown())
{
- wxSize size( item->CalcMin() );
+ wxSize size( item->GetMinSizeWithBorder() );
if (item->GetProportion() != 0)
{
if (m_orient == wxHORIZONTAL)
#endif // wxUSE_STATBOX
+
+#if WXWIN_COMPATIBILITY_2_4
+
// ----------------------------------------------------------------------------
// wxNotebookSizer
// ----------------------------------------------------------------------------
+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
+#if wxUSE_NOTEBOOK
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
+
#if wxUSE_BOOKCTRL
wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrl *bookctrl)
return wxSize( maxX, maxY ) + sizeBorder;
}
-
#if wxUSE_NOTEBOOK
wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
- : wxBookCtrlSizer(nb)
{
+ wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+ m_bookctrl = nb;
}
#endif // wxUSE_NOTEBOOOK
#endif // wxUSE_BOOKCTRL
+#endif // WXWIN_COMPATIBILITY_2_4
projects / wxWidgets.git / blobdiff