/////////////////////////////////////////////////////////////////////////////
-// 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"
#endif
#include "wx/sizer.h"
-#include "wx/utils.h"
-#include "wx/statbox.h"
-#include "wx/notebook.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/listimpl.cpp"
+
+#if WXWIN_COMPATIBILITY_2_4
+ #include "wx/notebook.h"
+#endif
//---------------------------------------------------------------------------
-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_CLASS(wxSizerItem, wxObject)
+IMPLEMENT_CLASS(wxSizer, wxObject)
+IMPLEMENT_CLASS(wxGridSizer, wxSizer)
+IMPLEMENT_CLASS(wxFlexGridSizer, wxGridSizer)
+IMPLEMENT_CLASS(wxBoxSizer, wxSizer)
#if wxUSE_STATBOX
-IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer)
+IMPLEMENT_CLASS(wxStaticBoxSizer, wxBoxSizer)
#endif
-#if wxUSE_NOTEBOOK
-IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer)
+#if wxUSE_BUTTON
+IMPLEMENT_CLASS(wxStdDialogButtonSizer, wxBoxSizer)
#endif
-//---------------------------------------------------------------------------
+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::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData )
+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();
+}
+
+wxSizerItem::wxSizerItem()
+{
+ Init();
- SetRatio(width, height);
+ m_proportion = 0;
+ m_border = 0;
+ m_flag = 0;
- // size is set directly
- m_size = m_minSize;
+ m_kind = Item_None;
}
-wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData )
+// window item
+void wxSizerItem::SetWindow(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);
+}
- // size is calculated later
- // m_size = ...
+wxSizerItem::wxSizerItem(wxWindow *window,
+ int proportion,
+ int flag,
+ int border,
+ wxObject* userData)
+ : m_proportion(proportion),
+ m_border(border),
+ m_flag(flag),
+ m_userData(userData)
+{
+ SetWindow(window);
}
-wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+// sizer item
+void wxSizerItem::SetSizer(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_proportion(proportion),
+ m_border(border),
+ m_flag(flag),
+ m_ratio(0.0),
+ m_userData(userData)
+{
+ SetSizer(sizer);
+
+ // m_minSize is set later
+}
- // minimal size is calculated later
- // m_minSize = ...
- m_ratio = 0;
+// spacer item
+void wxSizerItem::SetSpacer(const wxSize& size)
+{
+ m_kind = Item_Spacer;
+ m_spacer = new wxSizerSpacer(size);
+ m_minSize = size;
+ SetRatio(size);
+}
- // size is calculated later
- // m_size = ...
+wxSizerItem::wxSizerItem(int width,
+ int height,
+ int proportion,
+ int flag,
+ int border,
+ wxObject* userData)
+ : m_minSize(width, height), // minimal size is the initial size
+ m_proportion(proportion),
+ m_border(border),
+ m_flag(flag),
+ m_userData(userData)
+{
+ SetSpacer(width, height);
}
wxSizerItem::~wxSizerItem()
{
- if (m_userData)
- delete m_userData;
- if (m_sizer)
- delete m_sizer;
+ delete m_userData;
+
+ switch ( m_kind )
+ {
+ case Item_None:
+ break;
+
+ case Item_Window:
+ m_window->SetContainingSizer(NULL);
+ break;
+
+ case Item_Sizer:
+ delete m_sizer;
+ break;
+
+ case Item_Spacer:
+ delete m_spacer;
+ break;
+
+ case Item_Max:
+ default:
+ wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+ }
+}
+
+wxSize wxSizerItem::GetSpacer() const
+{
+ wxSize size;
+ if ( m_kind == Item_Spacer )
+ size = m_spacer->GetSize();
+
+ return size;
}
-wxSize wxSizerItem::GetSize()
+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;
wxSize wxSizerItem::CalcMin()
{
- wxSize ret;
if (IsSizer())
{
- ret = m_sizer->GetMinSize();
+ m_minSize = m_sizer->GetMinSize();
// if we have to preserve aspect ratio _AND_ this is
// the first-time calculation, consider ret to be initial size
- if ((m_flag & wxSHAPED) && !m_ratio)
- SetRatio(ret);
+ if ( (m_flag & wxSHAPED) && wxIsNullDouble(m_ratio) )
+ SetRatio(m_minSize);
}
- else
+ else if ( IsWindow() )
{
- if ( IsWindow() && (m_flag & wxADJUST_MINSIZE) )
- {
- // check if the best (minimal, in fact) window size hadn't changed
- // by chance: this may happen for, e.g. static text if its label
- // changed
- wxSize size = m_window->GetBestSize();
- if ( size.x > m_minSize.x )
- m_minSize.x = size.x;
- if ( size.y > m_minSize.y )
- m_minSize.y = size.y;
- }
-
- 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)
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
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;
- if (IsWindow())
- m_window->SetSize( pos.x, pos.y, size.x, size.y, wxSIZE_ALLOW_MINUS_ONE );
+ m_rect = wxRect(pos, size);
- m_size = 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.x, pos.y, size.x, size.y);
+ break;
+
+ case Item_Spacer:
+ m_spacer->SetSize(size);
+ break;
+
+ case Item_Max:
+ default:
+ wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+ }
}
void wxSizerItem::DeleteWindows()
{
- if (m_window)
- m_window->Destroy();
+ 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;
+
+ case Item_Sizer:
+ m_sizer->Show(show);
+ break;
+
+ case Item_Spacer:
+ m_spacer->Show(show);
+ break;
- if (m_sizer)
- m_sizer->DeleteWindows();
+ case Item_Max:
+ default:
+ wxFAIL_MSG( _T("unexpected wxSizerItem::m_kind") );
+ }
}
-bool wxSizerItem::IsWindow()
+bool wxSizerItem::IsShown() const
{
- return (m_window != NULL);
+ 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)
+ {
+ 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()
{
- Clear();
+ 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 ) );
- window->SetContainingSizer(this);
-}
+ m_children.Insert( index, item );
-void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
-{
- m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) );
+ if ( item->GetWindow() )
+ item->GetWindow()->SetContainingSizer( this );
+
+ return item;
}
-void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData )
+void wxSizer::SetContainingWindow(wxWindow *win)
{
- m_children.Append( new wxSizerItem( width, height, 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::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
+#if WXWIN_COMPATIBILITY_2_6
+bool wxSizer::Remove( wxWindow *window )
{
- m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );
- window->SetContainingSizer(this);
+ return Detach( window );
}
+#endif // WXWIN_COMPATIBILITY_2_6
-void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Remove( wxSizer *sizer )
{
- m_children.Insert( new wxSizerItem( sizer, 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( int width, int height, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Remove( int index )
{
- m_children.Insert( new wxSizerItem( width, height, 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") );
+
+ wxSizerItem *item = node->GetData();
+
+ if ( item->IsWindow() )
+ item->GetWindow()->SetContainingSizer( NULL );
+
+ delete item;
+ m_children.Erase( node );
+ return true;
}
-void wxSizer::Insert( int before, wxWindow *window, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Detach( wxSizer *sizer )
{
- m_children.Insert( before, new wxSizerItem( window, option, flag, border, userData ) );
- window->SetContainingSizer(this);
+ 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, wxSizer *sizer, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Detach( wxWindow *window )
{
- m_children.Insert( before, new wxSizerItem( sizer, 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)
+ {
+ item->GetWindow()->SetContainingSizer( NULL );
+ delete item;
+ m_children.Erase( node );
+ return true;
+ }
+ node = node->GetNext();
+ }
+
+ return false;
}
-void wxSizer::Insert( int before, int width, int height, int option, int flag, int border, wxObject* userData )
+bool wxSizer::Detach( int index )
{
- m_children.Insert( before, new wxSizerItem( width, height, 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();
+ else if ( item->IsWindow() )
+ item->GetWindow()->SetContainingSizer( NULL );
+
+ delete item;
+ m_children.Erase( node );
+ return true;
}
-bool wxSizer::Remove( wxWindow *window )
+bool wxSizer::Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive )
{
- wxASSERT( window );
+ wxASSERT_MSG( oldwin, _T("Replacing NULL window") );
+ wxASSERT_MSG( newwin, _T("Replacing with NULL window") );
- 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->GetWindow() == oldwin)
+ {
+ item->GetWindow()->SetContainingSizer( NULL );
+ item->SetWindow(newwin);
+ newwin->SetContainingSizer( this );
+ return true;
+ }
+ else if (recursive && item->IsSizer())
{
- item->GetWindow()->SetContainingSizer(NULL);
- m_children.DeleteNode( node );
- return TRUE;
+ if (item->GetSizer()->Replace( oldwin, newwin, true ))
+ return true;
}
- node = node->Next();
+
+ node = node->GetNext();
}
- return FALSE;
+ return false;
}
-bool wxSizer::Remove( wxSizer *sizer )
+bool wxSizer::Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive )
{
- wxASSERT( sizer );
+ 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->GetSizer() == sizer)
+ wxSizerItem *item = node->GetData();
+
+ if (item->GetSizer() == oldsz)
{
- m_children.DeleteNode( node );
- return TRUE;
+ wxSizer *old = item->GetSizer();
+ item->SetSizer(newsz);
+ delete old;
+ return true;
}
- node = node->Next();
+ else if (recursive && item->IsSizer())
+ {
+ if (item->GetSizer()->Replace( oldsz, newsz, true ))
+ return true;
+ }
+
+ node = node->GetNext();
}
- return FALSE;
+ return false;
}
-bool wxSizer::Remove( int pos )
+bool wxSizer::Replace( size_t old, wxSizerItem *newitem )
{
- wxNode *node = m_children.Nth( pos );
- if (!node) return FALSE;
+ wxCHECK_MSG( old < m_children.GetCount(), false, _T("Replace index is out of range") );
+ wxASSERT_MSG( newitem, _T("Replacing with NULL item") );
- m_children.DeleteNode( node );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( old );
- return TRUE;
+ wxCHECK_MSG( node, false, _T("Failed to find child node") );
+
+ wxSizerItem *item = node->GetData();
+ node->SetData(newitem);
+ delete item;
+
+ return true;
}
void wxSizer::Clear( bool delete_windows )
{
// First clear the ContainingSizer pointers
- 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->IsWindow())
- item->GetWindow()->SetContainingSizer(NULL);
- node = node->Next();
+ item->GetWindow()->SetContainingSizer( NULL );
+ node = node->GetNext();
}
// Destroy the windows if needed
DeleteWindows();
// Now empty the list
- m_children.Clear();
+ WX_CLEAR_LIST(wxSizerItemList, m_children);
}
void wxSizer::DeleteWindows()
{
- wxNode *node = m_children.First();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
- wxSizerItem *item = (wxSizerItem*)node->Data();
+ wxSizerItem *item = node->GetData();
+
item->DeleteWindows();
- node = node->Next();
+ node = node->GetNext();
}
}
-void wxSizer::Fit( wxWindow *window )
+wxSize wxSizer::Fit( wxWindow *window )
+{
+ wxSize size(window->IsTopLevel() ? FitSize(window)
+ : GetMinWindowSize(window));
+
+ window->SetSize( size );
+
+ return size;
+}
+
+void wxSizer::FitInside( wxWindow *window )
{
wxSize size;
if (window->IsTopLevel())
- size = FitSize( window );
+ size = VirtualFitSize( window );
else
- size = GetMinWindowSize( window );
+ size = GetMinClientSize( window );
- window->SetSize( size );
+ 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();
}
// Preserve the window's max size hints, but set the
// lower bound according to the sizer calculations.
- wxSize size = FitSize( window );
+ wxSize size = Fit( window );
+
window->SetSizeHints( size.x,
size.y,
window->GetMaxWidth(),
window->GetMaxHeight() );
}
-wxSize wxSizer::GetMaxWindowSize( wxWindow *window )
+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() );
+}
+
+wxSize wxSizer::GetMaxWindowSize( wxWindow *window ) const
{
return window->GetMaxSize();
}
wxSize wxSizer::GetMinWindowSize( wxWindow *window )
{
- wxSize minSize( GetMinSize() );
- wxSize size( window->GetSize() );
- wxSize client_size( window->GetClientSize() );
+ 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 )
{
+ if ( window->IsTopLevel() )
+ {
+ wxTopLevelWindow *tlw = wxDynamicCast(window, wxTopLevelWindow);
+ if ( tlw && tlw->IsAlwaysMaximized() )
+ {
+ return tlw->GetClientSize();
+ }
+ }
+
wxSize size = GetMinWindowSize( window );
wxSize sizeMax = GetMaxWindowSize( window );
// Limit the size if sizeMax != wxDefaultSize
- if ( size.x > sizeMax.x && sizeMax.x != -1 )
+ if ( size.x > sizeMax.x && sizeMax.x != wxDefaultCoord )
+ size.x = sizeMax.x;
+ if ( size.y > sizeMax.y && sizeMax.y != 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;
+}
+
+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 != -1 )
+ if ( size.y > sizeMax.y && sizeMax.y != wxDefaultCoord )
size.y = sizeMax.y;
return size;
m_position.y = y;
m_size.x = width;
m_size.y = height;
- CalcMin();
- RecalcSizes();
+ Layout();
}
wxSize wxSizer::GetMinSize()
bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
{
- wxASSERT( window );
+ wxASSERT_MSG( window, _T("SetMinSize for NULL window") );
- wxNode *node = m_children.First();
+ // Is it our immediate child?
+
+ 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") );
- wxNode *node = m_children.First();
+ // Is it our immediate child?
+
+ 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;
-}
-
-//---------------------------------------------------------------------------
-// wxGridSizer
-//---------------------------------------------------------------------------
-
-wxGridSizer::wxGridSizer( int rows, int cols, int vgap, int hgap )
-{
- m_rows = rows;
- m_cols = cols;
- m_vgap = vgap;
- m_hgap = hgap;
+ return true;
}
-wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
+wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
{
- m_rows = 0;
- m_cols = cols;
- m_vgap = vgap;
- m_hgap = hgap;
-}
+ wxASSERT_MSG( window, _T("GetItem for NULL window") );
-void wxGridSizer::RecalcSizes()
-{
- if (m_children.GetCount() == 0)
- return;
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
+ {
+ wxSizerItem *item = node->GetData();
- int nitems = m_children.GetCount();
- int nrows = m_rows;
- int ncols = m_cols;
+ if (item->GetWindow() == window)
+ {
+ return item;
+ }
+ else if (recursive && item->IsSizer())
+ {
+ wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
+ if (subitem)
+ return subitem;
+ }
- if (ncols > 0)
- nrows = (nitems + ncols-1) / ncols;
- else
- ncols = (nitems + nrows-1) / nrows;
+ node = node->GetNext();
+ }
- wxSize sz( GetSize() );
- wxPoint pt( GetPosition() );
+ return NULL;
+}
- int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
- int h = (sz.y - (nrows - 1) * m_vgap) / nrows;
+wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
+{
+ wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );
- int x = pt.x;
- for (int c = 0; c < ncols; c++)
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
+ while (node)
{
- int y = pt.y;
- for (int r = 0; r < nrows; r++)
+ 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();
+}
+
+bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
+{
+ wxSizerItem *item = GetItem( window, recursive );
+
+ if ( item )
+ {
+ item->Show( show );
+ return true;
+ }
+
+ return false;
+}
+
+bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
+{
+ wxSizerItem *item = GetItem( sizer, recursive );
+
+ if ( item )
+ {
+ item->Show( show );
+ return true;
+ }
+
+ return false;
+}
+
+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 )
+{
+}
+
+wxGridSizer::wxGridSizer( int cols, int vgap, int hgap )
+ : m_rows( cols == 0 ? 1 : 0 )
+ , m_cols( cols )
+ , m_vgap( vgap )
+ , m_hgap( hgap )
+{
+}
+
+int wxGridSizer::CalcRowsCols(int& nrows, int& ncols) const
+{
+ int nitems = m_children.GetCount();
+ if ( nitems)
+ {
+ 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;
+ }
+ }
+
+ return nitems;
+}
+
+void wxGridSizer::RecalcSizes()
+{
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
+ return;
+
+ wxSize sz( GetSize() );
+ wxPoint pt( GetPosition() );
+
+ int w = (sz.x - (ncols - 1) * m_hgap) / ncols;
+ int h = (sz.y - (nrows - 1) * m_vgap) / nrows;
+
+ int x = pt.x;
+ for (int c = 0; c < ncols; c++)
+ {
+ 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 );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+
+ wxASSERT_MSG( node, _T("Failed to find SizerItemList node") );
- SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h);
+ SetItemBounds( node->GetData(), x, y, w, h);
}
y = y + h + m_vgap;
}
wxSize wxGridSizer::CalcMin()
{
- if (m_children.GetCount() == 0)
- return wxSize(10,10);
+ int nrows, ncols;
+ if ( CalcRowsCols(nrows, ncols) == 0 )
+ return wxSize();
- int nitems = m_children.GetCount();
- int nrows = m_rows;
- int ncols = m_cols;
-
- 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();
}
- 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))
//---------------------------------------------------------------------------
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()
-{
- if (m_rowHeights)
- delete[] m_rowHeights;
- if (m_colWidths)
- delete[] m_colWidths;
-
- if (m_children.GetCount() == 0)
- return;
-
- int nitems = m_children.GetCount();
- int nrows = m_rows;
- int ncols = m_cols;
-
- if (ncols > 0)
- nrows = (nitems + ncols-1) / ncols;
- else
- ncols = (nitems + nrows-1) / nrows;
-
- m_rowHeights = new int[nrows];
- m_colWidths = new int[ncols];
-
- for (int col = 0; col < ncols; col++)
- m_colWidths[ col ] = 0;
- for (int row = 0; row < nrows; row++)
- m_rowHeights[ row ] = 0;
}
void wxFlexGridSizer::RecalcSizes()
{
- if (m_children.GetCount() == 0)
+ int nitems, nrows, ncols;
+ if ( (nitems = CalcRowsCols(nrows, ncols)) == 0 )
return;
- int nitems = m_children.GetCount();
- int nrows = m_rows;
- int ncols = m_cols;
-
- if (ncols > 0)
- nrows = (nitems + ncols-1) / ncols;
- else
- ncols = (nitems + nrows-1) / nrows;
-
- wxSize sz( GetSize() );
- wxSize minsz( CalcMin() );
wxPoint pt( GetPosition() );
- int delta;
- size_t idx;
+ wxSize sz( GetSize() );
- if ((m_growableRows.GetCount() > 0) && (sz.y > minsz.y))
- {
- delta = (sz.y - minsz.y) / m_growableRows.GetCount();
- for (idx = 0; idx < m_growableRows.GetCount(); idx++)
- m_rowHeights[ m_growableRows[idx] ] += delta;
- }
-
- if ((m_growableCols.GetCount() > 0) && (sz.x > minsz.x))
- {
- delta = (sz.x - minsz.x) / m_growableCols.GetCount();
- for (idx = 0; idx < m_growableCols.GetCount(); idx++)
- m_colWidths[ m_growableCols[idx] ] += delta;
- }
+ AdjustForGrowables(sz, m_calculatedMinSize, nrows, ncols);
sz = wxSize( pt.x + sz.x, pt.y + sz.y );
int i = r * ncols + c;
if (i < nitems)
{
- wxNode *node = m_children.Nth( i );
- wxASSERT( node );
+ wxSizerItemList::compatibility_iterator node = m_children.Item( i );
+
+ wxASSERT_MSG( node, _T("Failed to find node") );
int w = wxMax( 0, wxMin( m_colWidths[c], sz.x - x ) );
int h = wxMax( 0, wxMin( m_rowHeights[r], sz.y - y ) );
- SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h);
+ SetItemBounds( node->GetData(), x, y, w, h);
}
- y = y + m_rowHeights[r] + m_vgap;
+ if (m_rowHeights[r] != -1)
+ y = y + m_rowHeights[r] + m_vgap;
}
- x = x + m_colWidths[c] + m_hgap;
+ if (m_colWidths[c] != -1)
+ x = x + m_colWidths[c] + m_hgap;
}
}
wxSize wxFlexGridSizer::CalcMin()
{
- if (m_children.GetCount() == 0)
- return wxSize(10,10);
+ int nrows,
+ ncols;
+ size_t i, s;
- int nitems = m_children.GetCount();
- int nrows = m_rows;
- int ncols = m_cols;
+ // Number of rows/columns can change as items are added or removed.
+ if ( !CalcRowsCols(nrows, ncols) )
+ return wxSize();
- if (ncols > 0)
- nrows = (nitems + ncols-1) / ncols;
- else
- ncols = (nitems + nrows-1) / nrows;
+ m_rowHeights.SetCount(nrows);
+ m_colWidths.SetCount(ncols);
- CreateArrays();
+ // We have to recalcuate the sizes in case the item minimum size has
+ // changed since the previous layout, or the item has been hidden using
+ // wxSizer::Show(). If all the items in a row/column are hidden, the final
+ // dimension of the row/column will be -1, indicating that the column
+ // itself is hidden.
+ for( s = m_rowHeights.GetCount(), i = 0; i < s; ++i )
+ m_rowHeights[ i ] = -1;
+ for( s = m_colWidths.GetCount(), i = 0; i < s; ++i )
+ m_colWidths[ i ] = -1;
- int col;
- int row;
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
- int i = 0;
- wxNode *node = m_children.First();
+ i = 0;
while (node)
{
- 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 ] );
-
- node = node->Next();
+ wxSizerItem *item = node->GetData();
+ 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 ] );
+ }
+
+ node = node->GetNext();
i++;
}
+ AdjustForFlexDirection();
+
+ // Sum total minimum size, including gaps between rows/columns.
+ // -1 is used as a magic number meaning empty column.
int width = 0;
- for (col = 0; col < ncols; col++)
- width += m_colWidths[ col ];
+ for (int col = 0; col < ncols; col++)
+ if ( m_colWidths[ col ] != -1 )
+ width += m_colWidths[ col ] + m_hgap;
+ if (width > 0)
+ width -= m_hgap;
int height = 0;
- for (row = 0; row < nrows; row++)
- height += m_rowHeights[ row ];
+ for (int row = 0; row < nrows; row++)
+ if ( m_rowHeights[ row ] != -1 )
+ height += m_rowHeights[ row ] + m_vgap;
+ if (height > 0)
+ height -= m_vgap;
- return wxSize( width + (ncols-1) * m_hgap,
- height + (nrows-1) * m_vgap);
+ m_calculatedMinSize = wxSize( width, height );
+ return m_calculatedMinSize;
}
-void wxFlexGridSizer::AddGrowableRow( size_t idx )
+void wxFlexGridSizer::AdjustForFlexDirection()
{
- m_growableRows.Add( idx );
+ // the logic in CalcMin works when we resize flexibly in both directions
+ // but maybe this is not the case
+ if ( m_flexDirection != wxBOTH )
+ {
+ // select the array corresponding to the direction in which we do *not*
+ // resize flexibly
+ wxArrayInt& array = m_flexDirection == wxVERTICAL ? m_colWidths
+ : m_rowHeights;
+
+ const size_t count = array.GetCount();
+
+ // 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 )
+ {
+ array[n] = largest;
+ }
+ }
+}
+
+
+void wxFlexGridSizer::AdjustForGrowables(const wxSize& sz, const wxSize& minsz,
+ int nrows, int ncols)
+{
+ // what to do with the rows? by default, resize them proportionally
+ if ( sz.y > minsz.y && ( (m_flexDirection & wxVERTICAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+ {
+ int sum_proportions = 0;
+ int growable_space = 0;
+ int num = 0;
+ size_t idx;
+ for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+ {
+ // Since the number of rows/columns can change as items are
+ // inserted/deleted, we need to verify at runtime that the
+ // requested growable rows/columns are still valid.
+ if (m_growableRows[idx] >= nrows)
+ continue;
+
+ // If all items in a row/column are hidden, that row/column will
+ // have a dimension of -1. This causes the row/column to be
+ // hidden completely.
+ if (m_rowHeights[ m_growableRows[idx] ] == -1)
+ continue;
+ sum_proportions += m_growableRowsProportions[idx];
+ growable_space += m_rowHeights[ m_growableRows[idx] ];
+ num++;
+ }
+
+ if (num > 0)
+ {
+ for (idx = 0; idx < m_growableRows.GetCount(); idx++)
+ {
+ if (m_growableRows[idx] >= nrows )
+ continue;
+ if (m_rowHeights[ m_growableRows[idx] ] == -1)
+ m_rowHeights[ m_growableRows[idx] ] = 0;
+ else
+ {
+ int delta = (sz.y - minsz.y);
+ if (sum_proportions == 0)
+ delta = (delta/num) + m_rowHeights[ m_growableRows[idx] ];
+ else
+ delta = ((delta+growable_space)*m_growableRowsProportions[idx]) / sum_proportions;
+ m_rowHeights[ m_growableRows[idx] ] = delta;
+ }
+ }
+ }
+ }
+ else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.y > minsz.y) )
+ {
+ // rounding problem?
+ for ( int row = 0; row < nrows; ++row )
+ m_rowHeights[ row ] = sz.y / nrows;
+ }
+
+ // the same logic as above but for the columns
+ if ( sz.x > minsz.x && ( (m_flexDirection & wxHORIZONTAL) || (m_growMode == wxFLEX_GROWMODE_SPECIFIED) ) )
+ {
+ int sum_proportions = 0;
+ int growable_space = 0;
+ int num = 0;
+ size_t idx;
+ for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+ {
+ // Since the number of rows/columns can change as items are
+ // inserted/deleted, we need to verify at runtime that the
+ // requested growable rows/columns are still valid.
+ if (m_growableCols[idx] >= ncols)
+ continue;
+
+ // If all items in a row/column are hidden, that row/column will
+ // have a dimension of -1. This causes the column to be hidden
+ // completely.
+ if (m_colWidths[ m_growableCols[idx] ] == -1)
+ continue;
+ sum_proportions += m_growableColsProportions[idx];
+ growable_space += m_colWidths[ m_growableCols[idx] ];
+ num++;
+ }
+
+ if (num > 0)
+ {
+ for (idx = 0; idx < m_growableCols.GetCount(); idx++)
+ {
+ if (m_growableCols[idx] >= ncols )
+ continue;
+ if (m_colWidths[ m_growableCols[idx] ] == -1)
+ m_colWidths[ m_growableCols[idx] ] = 0;
+ else
+ {
+ int delta = (sz.x - minsz.x);
+ if (sum_proportions == 0)
+ delta = (delta/num) + m_colWidths[ m_growableCols[idx] ];
+ else
+ delta = ((delta+growable_space)*m_growableColsProportions[idx])/sum_proportions;
+ m_colWidths[ m_growableCols[idx] ] = delta;
+ }
+ }
+ }
+ }
+ else if ( (m_growMode == wxFLEX_GROWMODE_ALL) && (sz.x > minsz.x) )
+ {
+ for ( int col=0; col < ncols; ++col )
+ m_colWidths[ col ] = sz.x / ncols;
+ }
}
-void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) )
+
+void wxFlexGridSizer::AddGrowableRow( size_t idx, int proportion )
{
+ m_growableRows.Add( idx );
+ m_growableRowsProportions.Add( proportion );
}
-void wxFlexGridSizer::AddGrowableCol( size_t idx )
+void wxFlexGridSizer::AddGrowableCol( size_t idx, int proportion )
{
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( _T("column/row is already not growable") );
+}
+
+void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
+{
+ DoRemoveFromArrays(idx, m_growableCols, m_growableColsProportions);
}
-void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) )
+void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
{
+ DoRemoveFromArrays(idx, m_growableRows, m_growableRowsProportions);
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
wxBoxSizer::wxBoxSizer( int orient )
+ : m_orient( orient )
{
- m_orient = orient;
}
void wxBoxSizer::RecalcSizes()
return;
int delta = 0;
- int extra = 0;
if (m_stretchable)
{
if (m_orient == wxHORIZONTAL)
- {
- delta = (m_size.x - m_fixedWidth) / m_stretchable;
- extra = (m_size.x - m_fixedWidth) % m_stretchable;
- }
+ delta = m_size.x - m_fixedWidth;
else
- {
- delta = (m_size.y - m_fixedHeight) / m_stretchable;
- extra = (m_size.y - m_fixedHeight) % m_stretchable;
- }
+ delta = m_size.y - m_fixedHeight;
}
wxPoint pt( m_position );
- wxNode *node = m_children.GetFirst();
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
- wxSizerItem *item = (wxSizerItem*) node->Data();
-
- int weight = 1;
- if (item->GetOption())
- weight = item->GetOption();
+ wxSizerItem *item = node->GetData();
- wxSize size( item->CalcMin() );
-
- if (m_orient == wxVERTICAL)
+ if (item->IsShown())
{
- wxCoord height = size.y;
- if (item->GetOption())
+ wxSize size( item->GetMinSizeWithBorder() );
+
+ if (m_orient == wxVERTICAL)
{
- height = (delta * weight) + extra;
- extra = 0; // only the first item will get the remainder as extra size
+ 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 );
+
+ 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;
+
+ item->SetDimension( child_pos, child_size );
+
+ pt.y += height;
}
-
- wxPoint child_pos( pt );
- wxSize child_size( wxSize( size.x, height) );
-
- 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;
-
- item->SetDimension( child_pos, child_size );
-
- pt.y += height;
- }
- else
- {
- wxCoord width = size.x;
- if (item->GetOption())
+ else
{
- width = (delta * weight) + extra;
- extra = 0; // only the first item will get the remainder as extra size
+ 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;
+ }
+
+ wxPoint child_pos( pt );
+ wxSize child_size( 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;
+
+ if ( m_containingWindow )
+ {
+ child_pos.x = m_containingWindow->AdjustForLayoutDirection
+ (
+ child_pos.x,
+ width,
+ m_size.x
+ );
+ }
+
+ item->SetDimension( child_pos, child_size );
+
+ pt.x += width;
}
-
- 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;
-
- item->SetDimension( child_pos, child_size );
-
- pt.x += width;
}
- node = node->Next();
+ node = node->GetNext();
}
}
wxSize wxBoxSizer::CalcMin()
{
if (m_children.GetCount() == 0)
- return wxSize(10,10);
+ return wxSize();
m_stretchable = 0;
m_minWidth = 0;
m_fixedWidth = 0;
m_fixedHeight = 0;
- // Find how long each stretch unit needs to be
- int stretchSize = 1;
- wxNode *node = m_children.GetFirst();
+ // precalc item minsizes and count proportions
+ wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
- wxSizerItem *item = (wxSizerItem*) node->Data();
- if (item->GetOption() != 0)
+ wxSizerItem *item = node->GetData();
+
+ if ( item->IsShown() )
{
- int stretch = item->GetOption();
- wxSize size( item->CalcMin() );
- int sizePerStretch;
- // Integer division rounded up is (a + b - 1) / b
- if (m_orient == wxHORIZONTAL)
- sizePerStretch = ( size.x + stretch - 1 ) / stretch;
- else
- sizePerStretch = ( size.y + stretch - 1 ) / stretch;
- if (sizePerStretch > stretchSize)
- stretchSize = sizePerStretch;
+ item->CalcMin(); // result is stored in the item
+
+ m_stretchable += item->GetProportion();
}
- node = node->Next();
+
+ node = node->GetNext();
}
- // Calculate overall minimum size
- node = m_children.GetFirst();
+
+ // Total minimum size (width or height) of sizer
+ int maxMinSize = 0;
+
+ node = m_children.GetFirst();
while (node)
{
- wxSizerItem *item = (wxSizerItem*) node->Data();
-
- m_stretchable += item->GetOption();
+ wxSizerItem *item = node->GetData();
- wxSize size( item->CalcMin() );
- if (item->GetOption() != 0)
+ if (item->IsShown() && item->GetProportion() != 0)
{
+ int stretch = item->GetProportion();
+ wxSize size( item->GetMinSizeWithBorder() );
+ int minSize;
+
+ // Integer division rounded up is (a + b - 1) / b
+ // Round up needed in order to guarantee that all
+ // all items will have size not less then their min size
if (m_orient == wxHORIZONTAL)
- size.x = stretchSize * item->GetOption();
+ minSize = ( size.x*m_stretchable + stretch - 1)/stretch;
else
- size.y = stretchSize * item->GetOption();
- }
+ minSize = ( size.y*m_stretchable + stretch - 1)/stretch;
- 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 (minSize > maxMinSize)
+ maxMinSize = minSize;
}
+ node = node->GetNext();
+ }
+
+ // Calculate overall minimum size
+ node = m_children.GetFirst();
+ while (node)
+ {
+ wxSizerItem *item = node->GetData();
- if (item->GetOption() == 0)
+ if (item->IsShown())
{
- if (m_orient == wxVERTICAL)
+ wxSize size( item->GetMinSizeWithBorder() );
+ if (item->GetProportion() != 0)
{
- m_fixedHeight += size.y;
- m_fixedWidth = wxMax( m_fixedWidth, size.x );
+ if (m_orient == wxHORIZONTAL)
+ size.x = (maxMinSize*item->GetProportion())/m_stretchable;
+ else
+ size.y = (maxMinSize*item->GetProportion())/m_stretchable;
}
else
{
- m_fixedWidth += size.x;
- m_fixedHeight = wxMax( m_fixedHeight, size.y );
+ 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 );
+ }
}
- }
- node = node->Next();
+ 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();
}
return wxSize( m_minWidth, m_minHeight );
#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)
+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
-#ifdef __WXGTK__
- if ( box->GetLabel().IsEmpty() )
- *borderTop = 5;
- else
-#endif // __WXGTK__
- *borderTop = 15;
- (void)box;
- *borderOther = 5;
+ box->GetBordersForSizer(borderTop, borderOther);
}
void wxStaticBoxSizer::RecalcSizes()
return ret;
}
+void wxStaticBoxSizer::ShowItems( bool show )
+{
+ m_staticBox->Show( show );
+ wxBoxSizer::ShowItems( show );
+}
+
+bool wxStaticBoxSizer::Detach( wxWindow *window )
+{
+ // avoid deleting m_staticBox in our dtor if it's being detached from the
+ // sizer (which can happen because it's being already destroyed for
+ // example)
+ if ( window == m_staticBox )
+ {
+ m_staticBox = NULL;
+ return true;
+ }
+
+ return wxSizer::Detach( window );
+}
+
#endif // wxUSE_STATBOX
-//---------------------------------------------------------------------------
+#if wxUSE_BUTTON
+
+wxStdDialogButtonSizer::wxStdDialogButtonSizer()
+ : wxBoxSizer(wxHORIZONTAL)
+{
+ // Vertical buttons with lots of space on either side
+ // looks rubbish on WinCE, so let's not do this for now.
+ // If we are going to use vertical buttons, we should
+ // put the sizer to the right of other controls in the dialog,
+ // and that's beyond the scope of this sizer.
+#ifndef __WXWINCE__
+ bool is_pda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+ // If we have a PDA screen, put yes/no button over
+ // all other buttons, otherwise on the left side.
+ if (is_pda)
+ m_orient = wxVERTICAL;
+#endif
+
+ m_buttonAffirmative = NULL;
+ m_buttonApply = NULL;
+ m_buttonNegative = NULL;
+ m_buttonCancel = NULL;
+ m_buttonHelp = NULL;
+}
+
+void wxStdDialogButtonSizer::AddButton(wxButton *mybutton)
+{
+ switch (mybutton->GetId())
+ {
+ case wxID_OK:
+ case wxID_YES:
+ case wxID_SAVE:
+ m_buttonAffirmative = mybutton;
+ break;
+ case wxID_APPLY:
+ m_buttonApply = mybutton;
+ break;
+ case wxID_NO:
+ m_buttonNegative = mybutton;
+ break;
+ case wxID_CANCEL:
+ m_buttonCancel = mybutton;
+ break;
+ case wxID_HELP:
+ case wxID_CONTEXT_HELP:
+ m_buttonHelp = mybutton;
+ break;
+ default:
+ break;
+ }
+}
+
+void wxStdDialogButtonSizer::SetAffirmativeButton( wxButton *button )
+{
+ m_buttonAffirmative = button;
+}
+
+void wxStdDialogButtonSizer::SetNegativeButton( wxButton *button )
+{
+ m_buttonNegative = button;
+}
+
+void wxStdDialogButtonSizer::SetCancelButton( wxButton *button )
+{
+ m_buttonCancel = button;
+}
+
+void wxStdDialogButtonSizer::Realize()
+{
+#ifdef __WXMAC__
+ Add(0, 0, 0, wxLEFT, 6);
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+
+ if (m_buttonNegative){
+ // HIG POLICE BULLETIN - destructive buttons need extra padding
+ // 24 pixels on either side
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 12);
+ }
+
+ // extra whitespace between help/negative and cancel/ok buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+ // Cancel or help should be default
+ // m_buttonCancel->SetDefaultButton();
+ }
+
+ // Ugh, Mac doesn't really have apply dialogs, so I'll just
+ // figure the best place is between Cancel and OK
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 6);
+
+ if (m_buttonAffirmative){
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+
+ if (m_buttonAffirmative->GetId() == wxID_SAVE){
+ // these buttons have set labels under Mac so we should use them
+ m_buttonAffirmative->SetLabel(_("Save"));
+ m_buttonNegative->SetLabel(_("Don't Save"));
+ }
+ }
+
+ // Extra space around and at the right
+ Add(12, 24);
+#elif defined(__WXGTK20__)
+ Add(0, 0, 0, wxLEFT, 9);
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
+ // extra whitespace between help and cancel/ok buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonNegative){
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+ }
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+ // Cancel or help should be default
+ // m_buttonCancel->SetDefaultButton();
+ }
+
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, 3);
+
+ if (m_buttonAffirmative)
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT, 6);
+#elif defined(__WXMSW__)
+ // Windows
+
+ // right-justify buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonAffirmative){
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(2, 0)).x);
+ }
+
+ if (m_buttonNegative){
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(2, 0)).x);
+ }
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(2, 0)).x);
+ }
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(2, 0)).x);
+
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(2, 0)).x);
+#else
+ // GTK+1 and any other platform
+
+ // Add(0, 0, 0, wxLEFT, 5); // Not sure what this was for but it unbalances the dialog
+ if (m_buttonHelp)
+ Add((wxWindow*)m_buttonHelp, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonHelp->ConvertDialogToPixels(wxSize(4, 0)).x);
+
+ // extra whitespace between help and cancel/ok buttons
+ Add(0, 0, 1, wxEXPAND, 0);
+
+ if (m_buttonApply)
+ Add((wxWindow*)m_buttonApply, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonApply->ConvertDialogToPixels(wxSize(4, 0)).x);
+
+ if (m_buttonAffirmative){
+ Add((wxWindow*)m_buttonAffirmative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonAffirmative->ConvertDialogToPixels(wxSize(4, 0)).x);
+ }
+
+ if (m_buttonNegative){
+ Add((wxWindow*)m_buttonNegative, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonNegative->ConvertDialogToPixels(wxSize(4, 0)).x);
+ }
+
+ if (m_buttonCancel){
+ Add((wxWindow*)m_buttonCancel, 0, wxALIGN_CENTRE | wxLEFT | wxRIGHT, m_buttonCancel->ConvertDialogToPixels(wxSize(4, 0)).x);
+ // Cancel or help should be default
+ // m_buttonCancel->SetDefaultButton();
+ }
+
+#endif
+}
+
+#endif // wxUSE_BUTTON
+
+#if WXWIN_COMPATIBILITY_2_4
+
+// ----------------------------------------------------------------------------
// wxNotebookSizer
-//---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+#if wxUSE_BOOKCTRL
+IMPLEMENT_CLASS(wxBookCtrlSizer, wxSizer)
#if wxUSE_NOTEBOOK
+IMPLEMENT_CLASS(wxNotebookSizer, wxBookCtrlSizer)
+#endif // wxUSE_NOTEBOOK
+#endif // wxUSE_BOOKCTRL
-wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
-{
- wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
+#if wxUSE_BOOKCTRL
- m_notebook = nb;
+#if WXWIN_COMPATIBILITY_2_6
+
+wxBookCtrlSizer::wxBookCtrlSizer(wxBookCtrlBase *bookctrl)
+ : m_bookctrl(bookctrl)
+{
+ wxASSERT_MSG( bookctrl, wxT("wxBookCtrlSizer needs a control") );
}
-void wxNotebookSizer::RecalcSizes()
+#endif // WXWIN_COMPATIBILITY_2_6
+
+void wxBookCtrlSizer::RecalcSizes()
{
- m_notebook->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
+ m_bookctrl->SetSize( m_position.x, m_position.y, m_size.x, m_size.y );
}
-wxSize wxNotebookSizer::CalcMin()
+wxSize wxBookCtrlSizer::CalcMin()
{
- wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0));
+ wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0,0));
sizeBorder.x += 5;
sizeBorder.y += 5;
- if (m_notebook->GetChildren().GetCount() == 0)
+ if ( m_bookctrl->GetPageCount() == 0 )
{
return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
}
int maxX = 0;
int maxY = 0;
- wxWindowList::Node *node = m_notebook->GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator
+ node = m_bookctrl->GetChildren().GetFirst();
while (node)
{
wxWindow *item = node->GetData();
return wxSize( maxX, maxY ) + sizeBorder;
}
-#endif // wxUSE_NOTEBOOK
+#if wxUSE_NOTEBOOK
+
+#if WXWIN_COMPATIBILITY_2_6
+
+wxNotebookSizer::wxNotebookSizer(wxNotebook *nb)
+{
+ wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a control") );
+ m_bookctrl = nb;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+#endif // wxUSE_NOTEBOOOK
+#endif // wxUSE_BOOKCTRL
-// vi:sts=4:sw=4:et
+#endif // WXWIN_COMPATIBILITY_2_4
projects / wxWidgets.git / blobdiff