/////////////////////////////////////////////////////////////////////////////
// Name: sizer.cpp
-// Purpose: provide wxNewSizer class for layounting
+// Purpose: provide new wxSizer class for layout
// Author: Robert Roebling and Robin Dunn
// Modified by:
// Created:
#include "wx/sizer.h"
#include "wx/utils.h"
+#include "wx/statbox.h"
//---------------------------------------------------------------------------
-// wxNewSizerItem
+// wxSizerItem
//---------------------------------------------------------------------------
-wxNewSizerItem::wxNewSizerItem( int width, int height, int option )
+wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border )
{
m_window = (wxWindow *) NULL;
- m_sizer = (wxNewSizer *) NULL;
+ m_sizer = (wxSizer *) NULL;
+ m_option = option;
+ m_border = border;
+ m_flag = flag;
+
+ // minimal size is the initial size
m_minSize.x = width;
m_minSize.y = height;
- m_option = option;
+
+ // size is set directly
+ m_size = m_minSize;
}
-wxNewSizerItem::wxNewSizerItem( wxWindow *window, int option )
+wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border )
{
m_window = window;
- m_sizer = (wxNewSizer *) NULL;
- m_minSize = window->GetSize();
+ m_sizer = (wxSizer *) NULL;
m_option = option;
+ m_border = border;
+ m_flag = flag;
+
+ // minimal size is the initial size
+ m_minSize = window->GetSize();
+
+ // size is calculated later
+ // m_size = ...
}
-wxNewSizerItem::wxNewSizerItem( wxNewSizer *sizer, int option )
+wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border )
{
m_window = (wxWindow *) NULL;
m_sizer = sizer;
- m_minSize = sizer->GetSize();
m_option = option;
+ m_border = border;
+ m_flag = flag;
+
+ // minimal size is calculated later
+ // m_minSize = ...
+
+ // size is calculated later
+ // m_size = ...
}
-wxSize wxNewSizerItem::GetSize()
+wxSize wxSizerItem::GetSize()
{
- if (IsNewSizer())
- return m_sizer->GetSize();
-
+ wxSize ret;
+ if (IsSizer())
+ ret = m_sizer->GetSize();
+ else
if (IsWindow())
- return m_window->GetSize();
-
- return m_minSize;
+ ret = m_window->GetSize();
+ else ret = m_size;
+
+ if (m_flag & wxWEST)
+ ret.x += m_border;
+ if (m_flag & wxEAST)
+ ret.x += m_border;
+ if (m_flag & wxNORTH)
+ ret.y += m_border;
+ if (m_flag & wxSOUTH)
+ ret.y += m_border;
+
+ return ret;
}
-wxSize wxNewSizerItem::CalcMin()
+wxSize wxSizerItem::CalcMin()
{
- if (IsNewSizer())
- return m_sizer->CalcMin();
-
+ wxSize ret;
+ if (IsSizer())
+ ret = m_sizer->CalcMin();
+/*
+ The minimum size of a window should be the
+ initial size, as saved in m_minSize, not the
+ current size.
+
+ else
if (IsWindow())
- return m_window->GetSize();
-
- return m_minSize;
+ ret = m_window->GetSize();
+*/
+ else ret = m_minSize;
+
+ if (m_flag & wxWEST)
+ ret.x += m_border;
+ if (m_flag & wxEAST)
+ ret.x += m_border;
+ if (m_flag & wxNORTH)
+ ret.y += m_border;
+ if (m_flag & wxSOUTH)
+ ret.y += m_border;
+
+ return ret;
}
-void wxNewSizerItem::SetDimension( wxPoint pos, wxSize size )
+void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
- if (IsNewSizer())
+ if (m_flag & wxWEST)
+ {
+ pos.x += m_border;
+ size.x -= m_border;
+ }
+ if (m_flag & wxEAST)
+ {
+ size.x -= m_border;
+ }
+ if (m_flag & wxNORTH)
+ {
+ pos.y += m_border;
+ size.y -= m_border;
+ }
+ if (m_flag & wxSOUTH)
+ {
+ size.y -= m_border;
+ }
+
+ if (IsSizer())
m_sizer->SetDimension( pos.x, pos.y, size.x, size.y );
if (IsWindow())
m_window->SetSize( pos.x, pos.y, size.x, size.y );
-
- m_minSize = size;
+
+ m_size = size;
}
-bool wxNewSizerItem::IsWindow()
+bool wxSizerItem::IsWindow()
{
return (m_window != NULL);
}
-bool wxNewSizerItem::IsNewSizer()
+bool wxSizerItem::IsSizer()
{
return (m_sizer != NULL);
}
-bool wxNewSizerItem::IsSpacer()
+bool wxSizerItem::IsSpacer()
{
return (m_window == NULL) && (m_sizer == NULL);
}
//---------------------------------------------------------------------------
-// wxNewSizer
+// wxSizer
//---------------------------------------------------------------------------
-wxNewSizer::wxNewSizer()
+wxSizer::wxSizer()
{
m_children.DeleteContents( TRUE );
}
-wxNewSizer::~wxNewSizer()
+wxSizer::~wxSizer()
{
}
-void wxNewSizer::Add( wxWindow *window, int option )
+void wxSizer::Add( wxWindow *window, int option, int flag, int border )
{
- m_children.Append( new wxNewSizerItem( window, option ) );
+ m_children.Append( new wxSizerItem( window, option, flag, border ) );
}
-void wxNewSizer::Add( wxNewSizer *sizer, int option )
+void wxSizer::Add( wxSizer *sizer, int option, int flag, int border )
{
- m_children.Append( new wxNewSizerItem( sizer, option ) );
+ m_children.Append( new wxSizerItem( sizer, option, flag, border ) );
}
-void wxNewSizer::Add( int width, int height, int option )
+void wxSizer::Add( int width, int height, int option, int flag, int border )
{
- m_children.Append( new wxNewSizerItem( width, height, option ) );
+ m_children.Append( new wxSizerItem( width, height, option, flag, border ) );
}
-void wxNewSizer::Fit( wxWindow *window )
+void wxSizer::Prepend( wxWindow *window, int option, int flag, int border )
{
- window->SetSize( GetMinWindowSize( window ) );
+ m_children.Insert( new wxSizerItem( window, option, flag, border ) );
}
-void wxNewSizer::Layout()
+void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border )
{
- m_size = CalcMin();
- RecalcSizes();
+ m_children.Insert( new wxSizerItem( sizer, option, flag, border ) );
}
-void wxNewSizer::SetSizeHints( wxWindow *window )
+void wxSizer::Prepend( int width, int height, int option, int flag, int border )
{
- wxSize size( GetMinWindowSize( window ) );
- window->SetSizeHints( size.x, size.y );
+ m_children.Insert( new wxSizerItem( width, height, option, flag, border ) );
}
-wxSize wxNewSizer::GetMinWindowSize( wxWindow *window )
+bool wxSizer::Remove( 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 );
+ wxASSERT( window );
+
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxSizerItem *item = (wxSizerItem*)node->Data();
+ if (item->GetWindow() == window)
+ {
+ m_children.DeleteNode( node );
+ return TRUE;
+ }
+ node = node->Next();
+ }
+
+ return FALSE;
}
-void wxNewSizer::SetDimension( int x, int y, int width, int height )
+bool wxSizer::Remove( wxSizer *sizer )
{
- m_position.x = x;
- m_position.y = y;
- m_size.x = width;
- m_size.y = height;
- RecalcSizes();
+ wxASSERT( sizer );
+
+ wxNode *node = m_children.First();
+ while (node)
+ {
+ wxSizerItem *item = (wxSizerItem*)node->Data();
+ if (item->GetSizer() == sizer)
+ {
+ m_children.DeleteNode( node );
+ return TRUE;
+ }
+ node = node->Next();
+ }
+
+ return FALSE;
}
-//---------------------------------------------------------------------------
-// wxBorderNewSizer
-//---------------------------------------------------------------------------
-
-wxBorderNewSizer::wxBorderNewSizer( int sides )
+bool wxSizer::Remove( int pos )
{
- m_sides = sides;
+ wxNode *node = m_children.Nth( pos );
+ if (!node) return FALSE;
+
+ m_children.DeleteNode( node );
+
+ return TRUE;
}
-
-void wxBorderNewSizer::Add( wxWindow *window, int option )
+
+void wxSizer::Fit( wxWindow *window )
{
- wxCHECK_RET( m_children.GetCount() == 0, _T("border sizer can only hold one child") );
-
- wxNewSizer::Add( window, option );
+ window->SetSize( GetMinWindowSize( window ) );
}
-void wxBorderNewSizer::Add( wxNewSizer *sizer, int option )
+void wxSizer::Layout()
{
- wxCHECK_RET( m_children.GetCount() == 0, _T("border sizer can only hold one child") );
-
- wxNewSizer::Add( sizer, option );
+ CalcMin();
+ RecalcSizes();
}
-void wxBorderNewSizer::Add( int width, int height, int option )
+void wxSizer::SetSizeHints( wxWindow *window )
{
- wxCHECK_RET( m_children.GetCount() == 0, _T("border sizer can only hold one child") );
-
- wxNewSizer::Add( width, height, option );
+ wxSize size( GetMinWindowSize( window ) );
+ window->SetSizeHints( size.x, size.y );
}
-void wxBorderNewSizer::RecalcSizes()
+wxSize wxSizer::GetMinWindowSize( wxWindow *window )
{
- wxNode *node = m_children.GetFirst();
-
- if (!node)
- {
- SetDimension( m_position.x, m_position.y, 2, 2 );
- return;
- }
-
- wxNewSizerItem *item = (wxNewSizerItem*) node->Data();
-
- wxSize size( m_size );
- wxPoint pt( m_position );
- int borderSize = item->GetOption();
-
- if (m_sides & wxWEST)
- {
- size.x -= borderSize;
- pt.x += borderSize;
- }
- if (m_sides & wxEAST)
- {
- size.x -= borderSize;
- }
- if (m_sides & wxNORTH)
- {
- size.y -= borderSize;
- pt.y += borderSize;
- }
- if (m_sides & wxSOUTH)
- {
- size.y -= borderSize;
- }
-
- item->SetDimension( pt, size );
+ 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 );
}
-wxSize wxBorderNewSizer::CalcMin()
+void wxSizer::SetDimension( int x, int y, int width, int height )
{
- wxNode *node = m_children.GetFirst();
-
- if (!node)
- return wxSize(2,2);
-
- wxNewSizerItem *item = (wxNewSizerItem*) node->Data();
-
- wxSize size( item->CalcMin() );
-
- int borderSize = item->GetOption();
-
- if (m_sides & wxWEST)
- size.x += borderSize;
- if (m_sides & wxEAST)
- size.x += borderSize;
- if (m_sides & wxNORTH)
- size.y += borderSize;
- if (m_sides & wxSOUTH)
- size.y += borderSize;
-
- return size;
+ m_position.x = x;
+ m_position.y = y;
+ m_size.x = width;
+ m_size.y = height;
+ CalcMin();
+ RecalcSizes();
}
//---------------------------------------------------------------------------
-// wxBoxNewSizer
+// wxBoxSizer
//---------------------------------------------------------------------------
-wxBoxNewSizer::wxBoxNewSizer( int orient )
+wxBoxSizer::wxBoxSizer( int orient )
{
m_orient = orient;
}
-void wxBoxNewSizer::RecalcSizes()
+void wxBoxSizer::RecalcSizes()
{
if (m_children.GetCount() == 0)
- {
- SetDimension( m_position.x, m_position.y, 2, 2 );
return;
- }
int delta = 0;
int extra = 0;
wxNode *node = m_children.GetFirst();
while (node)
{
- wxNewSizerItem *item = (wxNewSizerItem*) node->Data();
+ wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1;
if (item->GetOption())
height = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size
}
- item->SetDimension( pt, wxSize( size.x, height) );
+
+ wxPoint child_pos( pt );
+ wxSize child_size( wxSize( size.x, height) );
+
+ if (item->GetFlag() & wxALIGN_RIGHT)
+ child_pos.x += m_size.x - size.x;
+ else if (item->GetFlag() & wxCENTER)
+ child_pos.x += (m_size.x - size.x) / 2;
+ else if (item->GetFlag() & wxEXPAND)
+ child_size.x = m_size.x;
+
+ item->SetDimension( child_pos, child_size );
+
pt.y += height;
}
else
width = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size
}
- item->SetDimension( pt, wxSize(width, size.y) );
+
+ wxPoint child_pos( pt );
+ wxSize child_size( wxSize(width, size.y) );
+
+ if (item->GetFlag() & wxALIGN_BOTTOM)
+ child_pos.y += m_size.y - size.y;
+ else if (item->GetFlag() & wxCENTER)
+ child_pos.y += (m_size.y - size.y) / 2;
+ else if (item->GetFlag() & wxEXPAND)
+ child_size.y = m_size.y;
+
+ item->SetDimension( child_pos, child_size );
+
pt.x += width;
}
}
}
-wxSize wxBoxNewSizer::CalcMin()
+wxSize wxBoxSizer::CalcMin()
{
if (m_children.GetCount() == 0)
return wxSize(2,2);
wxNode *node = m_children.GetFirst();
while (node)
{
- wxNewSizerItem *item = (wxNewSizerItem*) node->Data();
+ wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1;
if (item->GetOption())
return wxSize( m_minWidth, m_minHeight );
}
+
+//---------------------------------------------------------------------------
+// wxStaticBoxSizer
+//---------------------------------------------------------------------------
+
+wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
+ : wxBoxSizer( orient )
+{
+ wxASSERT_MSG( box, _T("wxStaticBoxSizer needs a static box") );
+
+ m_staticBox = box;
+}
+
+void wxStaticBoxSizer::RecalcSizes()
+{
+ // this will have to be done platform by platform
+ // as there is no way to guess the thickness of
+ // a wxStaticBox border
+ int top_border = 15;
+ if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
+ int other_border = 5;
+
+ 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;
+
+ wxBoxSizer::RecalcSizes();
+
+ m_position = old_pos;
+ m_size = old_size;
+}
+
+wxSize wxStaticBoxSizer::CalcMin()
+{
+ // this will have to be done platform by platform
+ // as there is no way to guess the thickness of
+ // a wxStaticBox border
+ int top_border = 15;
+ if (m_staticBox->GetLabel().IsEmpty()) top_border = 5;
+ int other_border = 5;
+
+ wxSize ret( wxBoxSizer::CalcMin() );
+ ret.x += 2*top_border;
+ ret.y += other_border + top_border;
+
+ return ret;
+}
projects / wxWidgets.git / blobdiff