/////////////////////////////////////////////////////////////////////////////
-// 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
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "sizer.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/sizer.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/sizer.h"
-#include "wx/utils.h"
-#include "wx/statbox.h"
-#include "wx/settings.h"
+#include "wx/display.h"
#include "wx/listimpl.cpp"
-#include "wx/intl.h"
-#if WXWIN_COMPATIBILITY_2_4
- #include "wx/notebook.h"
-#endif
-#ifdef __WXMAC__
-# include "wx/mac/uma.h"
-#endif
//---------------------------------------------------------------------------
IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
#endif
-WX_DEFINE_EXPORTED_LIST( wxSizerItemList );
+WX_DEFINE_EXPORTED_LIST( wxSizerItemList )
/*
TODO PROPERTIES
minsize
*/
-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
// 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()
-{
- m_window = NULL;
- m_sizer = NULL;
- m_show = true;
- m_userData = NULL;
- m_zoneRect = wxRect( 0, 0, 0, 0 );
-}
void wxSizerItem::Init(const wxSizerFlags& flags)
{
m_proportion = flags.GetProportion();
m_flag = flags.GetFlags();
m_border = flags.GetBorderInPixels();
+
+ ASSERT_VALID_SIZER_FLAGS( m_flag );
}
-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_zoneRect( 0, 0, 0, 0 )
- , 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_proportion( proportion )
- , m_border( border )
- , m_flag( flag )
- , m_zoneRect( 0, 0, 0, 0 )
- , m_show( true )
- , m_userData( userData )
-{
- if (flag & wxFIXED_MINSIZE)
- window->SetMinSize(window->GetSize());
+wxSizerItem::wxSizerItem()
+{
+ Init();
+
+ m_proportion = 0;
+ m_border = 0;
+ m_flag = 0;
+ m_id = wxID_NONE;
+}
+
+// window item
+void wxSizerItem::DoSetWindow(wxWindow *window)
+{
+ wxCHECK_RET( window, wxT("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_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 );
- // m_size is calculated later
+ DoSetWindow(window);
}
-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_zoneRect( 0, 0, 0, 0 )
- , m_show( true )
- , m_ratio( 0.0 )
- , m_userData( userData )
+// sizer item
+void wxSizerItem::DoSetSizer(wxSizer *sizer)
{
- // m_minSize is calculated later
- // m_size is calculated later
+ m_kind = Item_Sizer;
+ m_sizer = sizer;
}
-wxSizerItem::wxSizerItem()
+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)
{
- Init();
+ ASSERT_VALID_SIZER_FLAGS( m_flag );
- m_proportion = 0;
- m_border = 0;
- m_flag = 0;
+ DoSetSizer(sizer);
+
+ // 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()
{
delete m_userData;
+ Free();
+}
- if ( m_window )
- {
- m_window->SetContainingSizer(NULL);
- }
- else // we must be a sizer
+void wxSizerItem::Free()
+{
+ switch ( m_kind )
{
- delete m_sizer;
+ 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( wxT("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() 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( wxT("unexpected wxSizerItem::m_kind") );
+ }
if (m_flag & wxWEST)
ret.x += m_border;
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, wxT("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()
{
if (IsSizer())
// 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)
+ 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->GetBestFittingSize();
+ m_minSize = m_window->GetEffectiveMinSize();
}
return GetMinSizeWithBorder();
}
-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
size.y -= m_border;
}
- if (IsSizer())
- m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
+ 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( wxT("can't set size of uninitialized sizer item") );
+ break;
+
+ case Item_Window:
+ {
+ // Use wxSIZE_FORCE_EVENT here since a sizer item might
+ // have changed alignment or some other property which would
+ // not change the size of the window. In such a case, no
+ // wxSizeEvent would normally be generated and thus the
+ // control wouldn't get layed out correctly here.
+#if 1
+ m_window->SetSize(pos.x, pos.y, size.x, size.y,
+ wxSIZE_ALLOW_MINUS_ONE|wxSIZE_FORCE_EVENT );
+#else
+ m_window->SetSize(pos.x, pos.y, size.x, size.y,
+ wxSIZE_ALLOW_MINUS_ONE );
+#endif
+ break;
+ }
+ case Item_Sizer:
+ m_sizer->SetDimension(pos, size);
+ break;
- m_zoneRect = wxRect(pos, size);
- if (IsWindow())
- m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
+ case Item_Spacer:
+ m_spacer->SetSize(size);
+ break;
- m_size = size;
+ case Item_Max:
+ default:
+ wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
+ }
}
void wxSizerItem::DeleteWindows()
{
- if (m_window)
+ switch ( m_kind )
{
- m_window->Destroy();
- m_window = NULL;
+ 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( wxT("unexpected wxSizerItem::m_kind") );
}
- if (m_sizer)
- m_sizer->DeleteWindows();
}
-bool wxSizerItem::IsWindow() const
+void wxSizerItem::Show( bool show )
{
- return (m_window != NULL);
-}
+ switch ( m_kind )
+ {
+ case Item_None:
+ wxFAIL_MSG( wxT("can't show uninitialized sizer item") );
+ break;
-bool wxSizerItem::IsSizer() const
-{
- return (m_sizer != NULL);
-}
+ case Item_Window:
+ m_window->Show(show);
+ break;
-bool wxSizerItem::IsSpacer() const
-{
- return (m_window == NULL) && (m_sizer == NULL);
+ case Item_Sizer:
+ m_sizer->Show(show);
+ break;
+
+ case Item_Spacer:
+ m_spacer->Show(show);
+ break;
+
+ case Item_Max:
+ default:
+ wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
+ }
}
-void wxSizerItem::Show( bool show )
+bool wxSizerItem::IsShown() const
{
- m_show = show;
+ 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;
- if( IsWindow() )
- m_window->Show( show );
- else if( IsSizer() )
- m_sizer->ShowItems( show );
+ case Item_Spacer:
+ return m_spacer->IsShown();
- // ... nothing else to do to hide/show spacers
+ case Item_Max:
+ default:
+ wxFAIL_MSG( wxT("unexpected wxSizerItem::m_kind") );
+ }
+
+ return false;
}
+#if WXWIN_COMPATIBILITY_2_6
void wxSizerItem::SetOption( int option )
{
SetProportion( option );
{
return GetProportion();
}
+#endif // WXWIN_COMPATIBILITY_2_6
//---------------------------------------------------------------------------
// wxSizer
//---------------------------------------------------------------------------
-wxSizer::wxSizer()
- : m_minSize( wxSize( 0, 0 ) )
-{
-}
-
wxSizer::~wxSizer()
{
WX_CLEAR_LIST(wxSizerItemList, m_children);
{
m_children.Insert( index, item );
- if( item->GetWindow() )
+ if ( item->GetWindow() )
item->GetWindow()->SetContainingSizer( this );
+ if ( item->GetSizer() )
+ item->GetSizer()->SetContainingWindow( m_containingWindow );
+
return item;
}
+void wxSizer::SetContainingWindow(wxWindow *win)
+{
+ 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);
+ }
+ }
+}
+
+#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") );
+ wxASSERT_MSG( sizer, wxT("Removing NULL sizer") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
false,
- _T("Remove index is out of range") );
+ wxT("Remove 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->IsWindow() )
- item->GetWindow()->SetContainingSizer( NULL );
+ wxCHECK_MSG( node, false, wxT("Failed to find child node") );
- delete item;
+ delete node->GetData();
m_children.Erase( node );
+
return true;
}
bool wxSizer::Detach( wxSizer *sizer )
{
- wxASSERT_MSG( sizer, _T("Detaching NULL sizer") );
+ wxASSERT_MSG( sizer, wxT("Detaching NULL sizer") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
bool wxSizer::Detach( wxWindow *window )
{
- wxASSERT_MSG( window, _T("Detaching NULL window") );
+ wxASSERT_MSG( window, wxT("Detaching NULL window") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
if (item->GetWindow() == window)
{
- item->GetWindow()->SetContainingSizer( NULL );
delete item;
m_children.Erase( node );
return true;
{
wxCHECK_MSG( index >= 0 && (size_t)index < m_children.GetCount(),
false,
- _T("Detach index is out of range") );
+ wxT("Detach index is out of range") );
wxSizerItemList::compatibility_iterator node = m_children.Item( index );
- wxCHECK_MSG( node, false, _T("Failed to find child node") );
+ wxCHECK_MSG( node, false, wxT("Failed to find child node") );
wxSizerItem *item = node->GetData();
- if( item->IsSizer() )
+ if ( item->IsSizer() )
item->DetachSizer();
- else if( item->IsWindow() )
- item->GetWindow()->SetContainingSizer( NULL );
delete item;
m_children.Erase( node );
return true;
}
+bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
+{
+ wxASSERT_MSG( oldwin, wxT("Replacing NULL window") );
+ wxASSERT_MSG( newwin, wxT("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::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
+{
+ wxASSERT_MSG( oldsz, wxT("Replacing NULL sizer") );
+ wxASSERT_MSG( newsz, wxT("Replacing with NULL sizer") );
+
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxSizerItem *item = node->GetData();
+
+ if (item->GetSizer() == oldsz)
+ {
+ item->AssignSizer(newsz);
+ 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, wxT("Replace index is out of range") );
+ wxASSERT_MSG( newitem, wxT("Replacing with NULL item") );
+
+ wxSizerItemList::compatibility_iterator node = m_children.Item( old );
+
+ wxCHECK_MSG( node, false, wxT("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
}
}
-wxSize wxSizer::Fit( wxWindow *window )
+wxSize wxSizer::ComputeFittingClientSize(wxWindow *window)
{
- wxSize size(window->IsTopLevel() ? FitSize(window)
- : GetMinWindowSize(window));
+ wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" );
- window->SetSize( size );
+ // 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 )
+ {
+ // or, if we don't know which one it is, of the main one
+ disp = 0;
+ }
+
+ 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 size;
}
+wxSize wxSizer::ComputeFittingWindowSize(wxWindow *window)
+{
+ wxCHECK_MSG( window, wxDefaultSize, "window can't be NULL" );
+
+ return window->ClientToWindowSize(ComputeFittingClientSize(window));
+}
+
+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::FitInside( wxWindow *window )
{
wxSize size;
// Preserve the window's max size hints, but set the
// lower bound according to the sizer calculations.
- wxSize size = Fit( window );
+ // 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.
- window->SetSizeHints( size.x,
- size.y,
- window->GetMaxWidth(),
- window->GetMaxHeight() );
+ const wxSize clientSize = ComputeFittingClientSize(window);
+
+ window->SetMinClientSize(clientSize);
+ window->SetClientSize(clientSize);
}
+#if WXWIN_COMPATIBILITY_2_8
void wxSizer::SetVirtualSizeHints( wxWindow *window )
{
- // Preserve the window's max size hints, but set the
- // lower bound according to the sizer calculations.
-
FitInside( window );
- wxSize size( window->GetVirtualSize() );
- window->SetVirtualSizeHints( size.x,
- size.y,
- window->GetMaxWidth(),
- window->GetMaxHeight() );
}
+#endif // WXWIN_COMPATIBILITY_2_8
-wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const
+// 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
{
- return window->GetMaxSize();
-}
-
-wxSize wxSizer::GetMinWindowSize( 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 );
-}
-
-// 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 )
-{
- wxSize size = GetMinWindowSize( window );
- wxSize sizeMax = GetMaxWindowSize( 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::GetMaxClientSize( wxWindow *window ) const
-{
- wxSize maxSize( window->GetMaxSize() );
-
- if( maxSize != wxDefaultSize )
- {
- wxSize size( window->GetSize() );
- wxSize client_size( window->GetClientSize() );
-
- return wxSize( maxSize.x + client_size.x - size.x,
- maxSize.y + client_size.y - size.y );
- }
- else
- return wxDefaultSize;
+ return window->WindowToClientSize(window->GetMaxSize());
}
wxSize wxSizer::GetMinClientSize( wxWindow *WXUNUSED(window) )
return size;
}
-void wxSizer::SetDimension( int x, int y, int width, int height )
-{
- m_position.x = x;
- m_position.y = y;
- m_size.x = width;
- m_size.y = height;
- Layout();
-}
-
wxSize wxSizer::GetMinSize()
{
wxSize ret( CalcMin() );
bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
{
- wxASSERT_MSG( window, _T("SetMinSize for NULL window") );
+ wxASSERT_MSG( window, wxT("SetMinSize for NULL window") );
// Is it our immediate child?
bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
{
- wxASSERT_MSG( sizer, _T("SetMinSize for NULL sizer") );
+ wxASSERT_MSG( sizer, wxT("SetMinSize for NULL sizer") );
// Is it our immediate child?
{
wxSizerItemList::compatibility_iterator node = m_children.Item( index );
- wxCHECK_MSG( node, false, _T("Failed to find child node") );
+ wxCHECK_MSG( node, false, wxT("Failed to find child node") );
wxSizerItem *item = node->GetData();
wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
{
- wxASSERT_MSG( window, _T("GetItem for NULL window") );
+ wxASSERT_MSG( window, wxT("GetItem for NULL window") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
{
- wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );
+ wxASSERT_MSG( sizer, wxT("GetItem for NULL sizer") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxCHECK_MSG( index < m_children.GetCount(),
NULL,
- _T("GetItem index is out of range") );
+ wxT("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 );
node = node->GetNext();
}
- wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+ wxFAIL_MSG( wxT("IsShown failed to find sizer item") );
return false;
}
node = node->GetNext();
}
- wxFAIL_MSG( _T("IsShown failed to find sizer item") );
+ wxFAIL_MSG( wxT("IsShown failed to find sizer item") );
return false;
}
{
wxCHECK_MSG( index < m_children.GetCount(),
false,
- _T("IsShown index is out of range") );
+ wxT("IsShown index is out of range") );
return m_children.Item( index )->GetData()->IsShown();
}
//---------------------------------------------------------------------------
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 )
{
- if (m_rows == 0 && m_cols == 0)
- m_rows = 1;
}
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 )
{
- if (m_rows == 0 && m_cols == 0)
- m_rows = 1;
}
-int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
+wxSizerItem *wxGridSizer::Insert(size_t index, wxSizerItem *item)
{
- int nitems = m_children.GetCount();
- if ( nitems)
+ // if only the number of columns or the number of rows is specified for a
+ // sizer, arbitrarily many items can be added to it but if both of them are
+ // fixed, then the sizer can't have more than that many items -- check for
+ // this here to ensure that we detect errors as soon as possible
+ if ( m_cols && m_rows )
{
- if ( m_cols )
+ const int nitems = m_children.GetCount();
+ if ( nitems == m_cols*m_rows )
{
- ncols = m_cols;
- nrows = (nitems + m_cols - 1) / m_cols;
+ wxFAIL_MSG(
+ wxString::Format(
+ "too many items (%d > %d*%d) in grid sizer (maybe you "
+ "should omit the number of either rows or columns?)",
+ nitems + 1, m_cols, m_rows)
+ );
+
+ // additionally, continuing to use the specified number of columns
+ // and rows is not a good idea as callers of CalcRowsCols() expect
+ // that all sizer items can fit into m_cols/m_rows-sized arrays
+ // which is not the case if there are too many items and results in
+ // crashes, so let it compute the number of rows automatically by
+ // forgetting the (wrong) number of rows specified (this also has a
+ // nice side effect of giving only one assert even if there are
+ // many more items than allowed in this sizer)
+ m_rows = 0;
}
- 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;
- }
+ return wxSizer::Insert(index, item);
+}
+
+int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
+{
+ const int nitems = m_children.GetCount();
+ if ( m_cols && m_rows )
+ {
+ ncols = m_cols;
+ nrows = m_rows;
+
+ // this should be impossible because the too high number of items
+ // should have been detected by Insert() above
+ wxASSERT_MSG( nitems <= ncols*nrows, "logic error in wxGridSizer" );
+ }
+ 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( wxT("grid sizer must have either rows or columns fixed") );
+
+ nrows =
+ ncols = 0;
}
return nitems;
{
wxSizerItemList::compatibility_iterator node = m_children.Item( i );
- wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
+ wxASSERT_MSG( node, wxT("Failed to find SizerItemList node") );
SetItemBounds( node->GetData(), x, y, w, h);
}
{
int nrows, ncols;
if ( CalcRowsCols(nrows, ncols) == 0 )
- return wxSize(10, 10);
+ return wxSize();
// Find the max width and height for any component
int w = 0;
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 );
}
void wxFlexGridSizer::RecalcSizes()
{
- int nitems, nrows, ncols;
- if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+ int nrows, ncols;
+ if ( !CalcRowsCols(nrows, ncols) )
return;
- wxPoint pt( GetPosition() );
- wxSize sz( GetSize() );
+ const wxPoint pt(GetPosition());
+ const wxSize sz(GetSize());
- AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
+ AdjustForGrowables(sz);
- sz = wxSize( pt.x + sz.x, pt.y + sz.y );
+ wxSizerItemList::const_iterator i = m_children.begin();
+ const wxSizerItemList::const_iterator end = m_children.end();
- int x = pt.x;
- for (int c = 0; c < ncols; c++)
+ int y = 0;
+ for ( int r = 0; r < nrows; r++ )
{
- int y = pt.y;
- for (int r = 0; r < nrows; r++)
+ if ( m_rowHeights[r] == -1 )
{
- int i = r * ncols + c;
- if (i < nitems)
+ // this row is entirely hidden, skip it
+ for ( int c = 0; c < ncols; c++ )
{
- wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+ if ( i == end )
+ return;
- wxASSERT_MSG( node, _T("Failed to find node") );
+ ++i;
+ }
- int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) );
- int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) );
+ continue;
+ }
- SetItemBounds( node->GetData(), x, y, w, h);
- }
- y = y + m_rowHeights[r] + m_vgap;
+ 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;
}
- x = x + m_colWidths[c] + m_hgap;
+
+ if ( i == end )
+ return;
+
+ y += hrow + m_vgap;
}
}
+// helper function used in CalcMin() to sum up the sizes of non-hidden items
+static int SumArraySizes(const wxArrayInt& sizes, int gap)
+{
+ // Sum total minimum size, including gaps between rows/columns.
+ // -1 is used as a magic number meaning empty row/column.
+ int total = 0;
+
+ 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
+
+ total += sizes[n];
+ }
+ }
+
+ return total;
+}
+
+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 )
+ {
+ 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;
+ }
+ }
+
+ AdjustForFlexDirection();
+
+ m_calculatedMinSize = wxSize(SumArraySizes(m_colWidths, m_hgap),
+ SumArraySizes(m_rowHeights, m_vgap));
+}
+
wxSize wxFlexGridSizer::CalcMin()
{
- int nrows,
- ncols;
- size_t i, s;
+ int nrows,
+ ncols;
// Number of rows/columns can change as items are added or removed.
if ( !CalcRowsCols(nrows, ncols) )
- return wxSize(10, 10);
+ return wxSize();
- m_rowHeights.SetCount(nrows);
- m_colWidths.SetCount(ncols);
- // We have to recalcuate the sizes in case the item minimum size has
+ // 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.
- 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();
+ m_rowHeights.assign(nrows, -1);
+ m_colWidths.assign(ncols, -1);
- i = 0;
- while (node)
+ for ( wxSizerItemList::iterator i = m_children.begin();
+ i != m_children.end();
+ ++i)
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem * const item = *i;
if ( item->IsShown() )
{
- wxSize sz( item->CalcMin() );
- int row = i / ncols;
- int col = i % ncols;
-
- m_rowHeights[ row ] = wxMax( wxMax( 0, sz.y ), m_rowHeights[ row ] );
- m_colWidths[ col ] = wxMax( wxMax( 0, sz.x ), m_colWidths[ col ] );
+ item->CalcMin();
}
-
- node = node->GetNext();
- i++;
}
- AdjustForFlexDirection();
+ // 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);
- // 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 ] + ( col == ncols-1 ? 0 : m_hgap );
-
- int height = 0;
- for (int row = 0; row < nrows; row++)
- if ( m_rowHeights[ row ] != -1 )
- height += m_rowHeights[ row ] + ( row == nrows-1 ? 0 : m_vgap );
-
- m_calculatedMinSize = wxSize( width, height );
return m_calculatedMinSize;
}
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 )
// and now fill it with the largest value
for ( n = 0; n < count; ++n )
{
- array[n] = largest;
+ // don't touch hidden rows
+ if ( array[n] != -1 )
+ array[n] = largest;
}
}
}
+// 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 ( delta <= 0 )
+ return;
-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) ) )
+ // total sum of proportions of all non-hidden rows
+ int sum_proportions = 0;
+
+ // number of currently shown growable rows
+ int num = 0;
+
+ const int max_idx = sizes.size();
+
+ 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++;
+ }
+
+ if ( !num )
+ return;
+
+ // the remaining extra free space, adjusted during each iteration
+ for ( idx = 0; idx < count; idx++ )
{
- int sum_proportions = 0;
- int growable_space = 0;
- int num = 0;
- size_t idx;
- for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+ if ( growable[idx] >= max_idx )
+ continue;
+
+ if ( sizes[ growable[idx] ] == -1 )
+ continue;
+
+ int cur_delta;
+ if ( sum_proportions == 0 )
{
- // 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;
+ // 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;
+ }
- // 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++;
+ sizes[growable[idx]] += cur_delta;
+ delta -= cur_delta;
+ }
+}
+
+void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz)
+{
+#if wxDEBUG_LEVEL
+ // by the time this function is called, the sizer should be already fully
+ // initialized and hence the number of its columns and rows is known and we
+ // can check that all indices in m_growableCols/Rows are valid (see also
+ // comments in AddGrowableCol/Row())
+ if ( !m_rows || !m_cols )
+ {
+ int nrows, ncols;
+ CalcRowsCols(nrows, ncols);
+
+ if ( !m_rows )
+ {
+ for ( size_t n = 0; n < m_growableRows.size(); n++ )
+ {
+ wxASSERT_MSG( m_growableRows[n] < nrows,
+ "invalid growable row index" );
+ }
}
- if (num > 0)
+ if ( !m_cols )
{
- for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+ for ( size_t n = 0; n < m_growableCols.size(); n++ )
{
- 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;
- }
+ wxASSERT_MSG( m_growableCols[n] < ncols,
+ "invalid growable column index" );
}
}
}
- 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;
- }
+#endif // wxDEBUG_LEVEL
+
- // the same logic as above but for the columns
- if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+ if ( (m_flexDirection & wxHORIZONTAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
{
- int sum_proportions = 0;
- int growable_space = 0;
- int num = 0;
- size_t idx;
- for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+ 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 )
{
- // 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++;
+ const int col = n % ncols;
+ didAdjustMinSize |= (*i)->InformFirstDirection(wxHORIZONTAL, m_colWidths[col], sz.y - m_calculatedMinSize.y);
}
- if (num > 0)
+ // Only redo if info was actually used
+ if( didAdjustMinSize )
{
- 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;
- }
- }
+ DoAdjustForGrowables
+ (
+ sz.x - m_calculatedMinSize.x,
+ m_growableCols,
+ m_colWidths,
+ m_growMode == wxFLEX_GROWMODE_SPECIFIED ? &m_growableColsProportions
+ : NULL
+ );
}
}
- else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
+
+ if ( (m_flexDirection & wxVERTICAL) || (m_growMode != wxFLEX_GROWMODE_NONE) )
{
- for ( int col=0; col < ncols; ++col )
- m_colWidths[ col ] = sz.x / ncols;
+ // 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
+ );
}
}
+bool wxFlexGridSizer::IsRowGrowable( size_t idx )
+{
+ return m_growableRows.Index( idx ) != wxNOT_FOUND;
+}
-void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
+bool wxFlexGridSizer::IsColGrowable( size_t idx )
{
- m_growableRows.Add( idx );
- m_growableRowsProportions.Add( proportion );
+ return m_growableCols.Index( idx ) != wxNOT_FOUND;
}
-void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
+void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
{
- m_growableRows.Remove( idx );
+ int nrows, ncols;
+ CalcRowsCols(nrows, ncols);
+
+ wxASSERT_MSG( !IsRowGrowable( idx ),
+ "AddGrowableRow() called for growable row" );
+
+ // notice that we intentionally don't check the index validity here in (the
+ // common) case when the number of rows was not specified in the ctor -- in
+ // this case it will be computed only later, when all items are added to
+ // the sizer, and the check will be done in AdjustForGrowables()
+ wxCHECK_RET( !m_rows || idx < (size_t)m_rows, "invalid row index" );
+
+ m_growableRows.Add( idx );
+ m_growableRowsProportions.Add( proportion );
}
void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
{
+ int nrows, ncols;
+ CalcRowsCols(nrows, ncols);
+
+ wxASSERT_MSG( !IsColGrowable( idx ),
+ "AddGrowableCol() called for growable column" );
+
+ // see comment in AddGrowableRow(): although it's less common to omit the
+ // specification of the number of columns, it still can also happen
+ wxCHECK_RET( !m_cols || idx < (size_t)ncols, "invalid column index" );
+
m_growableCols.Add( idx );
m_growableColsProportions.Add( proportion );
}
+// 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( wxT("column/row is already not growable") );
+}
+
void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
{
- m_growableCols.Remove( idx );
+ DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions);
+}
+
+void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
+{
+ DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions);
}
//---------------------------------------------------------------------------
// wxBoxSizer
//---------------------------------------------------------------------------
-wxBoxSizer::wxBoxSizer( int orient )
- : m_orient( orient )
-{
-}
-
void wxBoxSizer::RecalcSizes()
{
- if (m_children.GetCount() == 0)
+ if ( m_children.empty() )
return;
- int delta = 0;
- if (m_stretchable)
- {
- if (m_orient == wxHORIZONTAL)
- delta = m_size.x - m_fixedWidth;
- else
- delta = m_size.y - m_fixedHeight;
- }
+ const wxCoord totalMinorSize = GetSizeInMinorDir(m_size);
- wxPoint pt( m_position );
+ // 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);
- wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
- while (node)
+
+ // 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 )
{
- wxSizerItem *item = node->GetData();
+ wxSizerItem * const item = *i;
+
+ if ( !item->IsShown() )
+ continue;
- if (item->IsShown())
+ wxSize szMinPrev = item->GetMinSizeWithBorder();
+ item->InformFirstDirection(m_orient^wxBOTH,totalMinorSize,delta);
+ wxSize szMin = item->GetMinSizeWithBorder();
+ int deltaChange = GetSizeInMajorDir(szMin-szMinPrev);
+ if( deltaChange )
{
- wxSize size( item->GetMinSizeWithBorder() );
+ // 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;
- if (m_orient == wxVERTICAL)
- {
- wxCoord height = size.y;
- if (item->GetProportion())
- {
- // 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( size.x, height );
+ // might have a new delta now
+ delta = GetSizeInMajorDir(m_size) - GetSizeInMajorDir(m_minSize);
- 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;
+ // the position at which we put the next child
+ wxPoint pt(m_position);
- item->SetDimension( child_pos, child_size );
+ int totalProportion = m_totalProportion;
+ for ( i = m_children.begin();
+ i != m_children.end();
+ ++i )
+ {
+ wxSizerItem * const item = *i;
- pt.y += height;
- }
- else
- {
- wxCoord width = size.x;
- if (item->GetProportion())
- {
- // Because of at least one visible item has non-zero
- // proportion then m_stretchable is not zero
- width = (delta * item->GetProportion()) / m_stretchable;
- }
+ if ( !item->IsShown() )
+ continue;
+
+ const wxSize sizeThis(item->GetMinSizeWithBorder());
- wxPoint child_pos( pt );
- wxSize child_size( width, size.y );
+ // adjust the size in the major direction using the proportion
+ wxCoord majorSize = GetSizeInMajorDir(sizeThis);
- 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;
+ // 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 )
+ {
+ const int propItem = item->GetProportion();
+ if ( propItem )
+ {
+ const int deltaItem = (delta * propItem) / totalProportion;
- item->SetDimension( child_pos, child_size );
+ majorSize += deltaItem;
- pt.x += width;
+ delta -= deltaItem;
+ totalProportion -= propItem;
}
}
- node = node->GetNext();
- }
-}
-wxSize wxBoxSizer::CalcMin()
-{
- if (m_children.GetCount() == 0)
- return wxSize(10,10);
+ // apply the alignment in the minor direction
+ wxPoint posChild(pt);
- m_stretchable = 0;
- m_minWidth = 0;
- m_minHeight = 0;
- m_fixedWidth = 0;
- m_fixedHeight = 0;
+ wxCoord minorSize = GetSizeInMinorDir(sizeThis);
+ const int flag = item->GetFlag();
+ if ( flag & (wxEXPAND | wxSHAPED) )
+ {
+ minorSize = totalMinorSize;
+ }
+ else if ( flag & (IsVertical() ? wxALIGN_RIGHT : wxALIGN_BOTTOM) )
+ {
+ 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;
+ }
- // 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
+ // apply RTL adjustment for horizontal sizers:
+ if ( !IsVertical() && m_containingWindow )
+ {
+ posChild.x = m_containingWindow->AdjustForLayoutDirection
+ (
+ posChild.x,
+ majorSize,
+ m_size.x
+ );
+ }
- if (item->IsShown() && item->GetProportion() != 0)
- m_stretchable += item->GetProportion();
+ // finally set size of this child and advance to the next one
+ item->SetDimension(posChild, SizeFromMajorMinor(majorSize, minorSize));
- node = node->GetNext();
+ PosInMajorDir(pt) += majorSize;
}
+}
- // Total minimum size (width or height) of sizer
- int maxMinSize = 0;
+wxSize wxBoxSizer::CalcMin()
+{
+ m_totalProportion = 0;
+ m_minSize = wxSize(0, 0);
- 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 = node->GetData();
-
- if (item->IsShown() && item->GetProportion() != 0)
- {
- int stretch = item->GetProportion();
- wxSize size( item->GetMinSizeWithBorder() );
- int minSize;
+ wxSizerItem * const item = *i;
- // 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)
- minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
- else
- minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
+ if ( !item->IsShown() )
+ continue;
- if (minSize > maxMinSize)
- maxMinSize = minSize;
- }
- node = node->GetNext();
- }
-
- // Calculate overall minimum size
- node = m_children.GetFirst();
- while (node)
- {
- wxSizerItem *item = node->GetData();
-
- if (item->IsShown())
- {
- wxSize size( item->GetMinSizeWithBorder() );
- if (item->GetProportion() != 0)
- {
- if (m_orient == wxHORIZONTAL)
- size.x = (maxMinSize*item->GetProportion())/m_stretchable;
- else
- size.y = (maxMinSize*item->GetProportion())/m_stretchable;
- }
- else
- {
- 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);
- 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();
+ m_totalProportion += item->GetProportion();
}
- return wxSize( m_minWidth, m_minHeight );
+ return m_minSize;
}
//---------------------------------------------------------------------------
#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);
}
-static void GetStaticBoxBorders( wxStaticBox *box,
- int *borderTop,
- int *borderOther)
+wxStaticBoxSizer::wxStaticBoxSizer(int orient, wxWindow *win, const wxString& s)
+ : wxBoxSizer(orient),
+ m_staticBox(new wxStaticBox(win, wxID_ANY, s))
{
- // 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);
-#elif defined(__WXMAC__)
-
- static int extraTop = -1; // Uninitted
- static int other = 5;
-
- if ( extraTop == -1 )
- {
- // The minimal border used for the top. Later on the staticbox'
- // font height is added to this.
- extraTop = 0;
-
- if ( UMAGetSystemVersion() >= 0x1030 /*Panther*/ )
- {
- // As indicated by the HIG, Panther needs an extra border of 11
- // pixels (otherwise overlapping occurs at the top). The "other"
- // border has to be 11.
- extraTop = 11;
- other = 11;
- }
-
- }
-
- *borderTop = extraTop + box->GetCharHeight();
- *borderOther = other;
-
-#else
-#ifdef __WXGTK__
- if ( box->GetLabel().empty() )
- *borderTop = 5;
- else
-#endif // __WXGTK__
- *borderTop = box->GetCharHeight();
+ // same as above
+ m_staticBox->SetContainingSizer(this);
+}
- *borderOther = 5;
-#endif // __WXCOCOA__
+wxStaticBoxSizer::~wxStaticBoxSizer()
+{
+ delete m_staticBox;
}
void wxStaticBoxSizer::RecalcSizes()
{
int top_border, other_border;
- GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
+ m_staticBox->GetBordersForSizer(&top_border, &other_border);
m_staticBox->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
- wxPoint old_pos( m_position );
- m_position.x += other_border;
- m_position.y += top_border;
wxSize old_size( m_size );
m_size.x -= 2*other_border;
m_size.y -= top_border + other_border;
+ wxPoint old_pos( m_position );
+ if (m_staticBox->GetChildren().GetCount() > 0)
+ {
+#if defined( __WXGTK20__ )
+ // if the wxStaticBox has created a wxPizza to contain its children
+ // (see wxStaticBox::AddChild) then we need to place the items it contains
+ // in the wxBoxSizer::RecalcSizes() call below using coordinates relative
+ // to the top-left corner of the staticbox:
+ m_position.x = m_position.y = 0;
+#else
+ // if the wxStaticBox has childrens, then these windows must be placed
+ // by the wxBoxSizer::RecalcSizes() call below using coordinates relative
+ // to the top-left corner of the staticbox (but unlike wxGTK, we need
+ // to keep in count the static borders here!):
+ m_position.x = other_border;
+ m_position.y = top_border;
+#endif
+ }
+ else
+ {
+ // the windows contained in the staticbox have been created as siblings of the
+ // staticbox (this is the "old" way of staticbox contents creation); in this
+ // case we need to position them with coordinates relative to our common parent
+ m_position.x += other_border;
+ m_position.y += top_border;
+ }
+
wxBoxSizer::RecalcSizes();
m_position = old_pos;
wxSize wxStaticBoxSizer::CalcMin()
{
int top_border, other_border;
- GetStaticBoxBorders(m_staticBox, &top_border, &other_border);
+ m_staticBox->GetBordersForSizer(&top_border, &other_border);
wxSize ret( wxBoxSizer::CalcMin() );
ret.x += 2*other_border;
+
+ // ensure that we're wide enough to show the static box label (there is no
+ // need to check for the static box best size in vertical direction though)
+ const int boxWidth = m_staticBox->GetBestSize().x;
+ if ( ret.x < boxWidth )
+ ret.x = boxWidth;
+
ret.y += other_border + top_border;
return ret;
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
+//---------------------------------------------------------------------------
+// wxStdDialogButtonSizer
+//---------------------------------------------------------------------------
+
#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 = mybutton;
break;
case wxID_CANCEL:
+ case wxID_CLOSE:
m_buttonCancel = mybutton;
break;
case wxID_HELP:
+ case wxID_CONTEXT_HELP:
m_buttonHelp = mybutton;
break;
default:
m_buttonCancel = button;
}
-void wxStdDialogButtonSizer::Finalise()
+void wxStdDialogButtonSizer::Realize()
{
#ifdef __WXMAC__
Add(0, 0, 0, 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"));
+ if (m_buttonNegative)
+ m_buttonNegative->SetLabel(_("Don't Save"));
}
}
// Extra space around and at the right
- Add(12, 24);
+ Add(12, 40);
#elif defined(__WXGTK20__)
Add(0, 0, 0, wxLEFT, 9);
if (m_buttonHelp)
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_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
- // do the same thing for GTK1 and Windows platforms
- // and assume any platform not accounted for here will use
- // Windows style
- Add(0, 0, 0, wxLEFT, 9);
+ // 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);
}
if (m_buttonCancel){
- Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);
+ 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 // 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
-
-wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl)
- : m_bookctrl(bookctrl)
-{
- wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );
-}
-
-void wxBookCtrlSizer::RecalcSizes()
-{
- m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
-}
-
-wxSize wxBookCtrlSizer::CalcMin()
-{
- wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0));
-
- sizeBorder.x += 5;
- sizeBorder.y += 5;
-
- if ( m_bookctrl->GetPageCount() == 0 )
- {
- return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
- }
-
- int maxX = 0;
- int maxY = 0;
-
- wxWindowList::compatibility_iterator
- node = m_bookctrl->GetChildren().GetFirst();
- while (node)
- {
- wxWindow *item = node->GetData();
- wxSizer *itemsizer = item->GetSizer();
-
- if (itemsizer)
- {
- wxSize subsize( itemsizer->CalcMin() );
-
- if (subsize.x > maxX)
- maxX = subsize.x;
- if (subsize.y > maxY)
- maxY = subsize.y;
- }
-
- node = node->GetNext();
- }
-
- return wxSize( maxX, maxY ) + sizeBorder;
-}
-
-#if wxUSE_NOTEBOOK
-
-wxNotebookSizer::wxNotebookSizer(wxNotebook *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