Added userData to wxSizerItems and other things to make sizers more
usable/overrideable from wxPython. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
parent
76f78a96ce
commit
0c0d686fe5
@ -1,9 +1,9 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: sizer.h
|
||||
// Purpose: provide wxSizer class for layounting
|
||||
// Purpose: provide wxSizer class for layouting
|
||||
// Author: Robert Roebling and Robin Dunn
|
||||
// Modified by:
|
||||
// Created:
|
||||
// Created:
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
@ -39,27 +39,30 @@ class wxStaticBoxSizer;
|
||||
|
||||
class WXDLLEXPORT wxSizerItem: public wxObject
|
||||
{
|
||||
DECLARE_CLASS(wxSizerItem);
|
||||
public:
|
||||
// spacer
|
||||
wxSizerItem( int width, int height, int option, int flag, int border );
|
||||
wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData);
|
||||
|
||||
// window
|
||||
wxSizerItem( wxWindow *window, int option, int flag, int border );
|
||||
wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData );
|
||||
|
||||
// subsizer
|
||||
wxSizerItem( wxSizer *sizer, int option, int flag, int border );
|
||||
wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData );
|
||||
|
||||
~wxSizerItem();
|
||||
|
||||
virtual wxSize GetSize();
|
||||
virtual wxSize CalcMin();
|
||||
virtual void SetDimension( wxPoint pos, wxSize size );
|
||||
|
||||
|
||||
bool IsWindow();
|
||||
bool IsSizer();
|
||||
bool IsSpacer();
|
||||
|
||||
wxWindow *GetWindow() const
|
||||
|
||||
wxWindow *GetWindow() const
|
||||
{ return m_window; }
|
||||
wxSizer *GetSizer() const
|
||||
wxSizer *GetSizer() const
|
||||
{ return m_sizer; }
|
||||
int GetOption() const
|
||||
{ return m_option; }
|
||||
@ -67,7 +70,9 @@ public:
|
||||
{ return m_flag; }
|
||||
int GetBorder() const
|
||||
{ return m_border; }
|
||||
|
||||
wxObject* GetUserData()
|
||||
{ return m_userData; }
|
||||
|
||||
protected:
|
||||
wxWindow *m_window;
|
||||
wxSizer *m_sizer;
|
||||
@ -76,6 +81,7 @@ protected:
|
||||
int m_option;
|
||||
int m_border;
|
||||
int m_flag;
|
||||
wxObject *m_userData;
|
||||
};
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
@ -84,24 +90,25 @@ protected:
|
||||
|
||||
class WXDLLEXPORT wxSizer: public wxObject
|
||||
{
|
||||
DECLARE_CLASS(wxSizer);
|
||||
public:
|
||||
wxSizer();
|
||||
~wxSizer();
|
||||
|
||||
virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0 );
|
||||
virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0 );
|
||||
virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0 );
|
||||
|
||||
virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0 );
|
||||
virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0 );
|
||||
virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0 );
|
||||
|
||||
|
||||
virtual void Add( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
|
||||
virtual void Add( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
|
||||
virtual void Add( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
|
||||
|
||||
virtual void Prepend( wxWindow *window, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
|
||||
virtual void Prepend( wxSizer *sizer, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
|
||||
virtual void Prepend( int width, int height, int option = 0, int flag = 0, int border = 0, wxObject* userData = NULL );
|
||||
|
||||
virtual bool Remove( wxWindow *window );
|
||||
virtual bool Remove( wxSizer *sizer );
|
||||
virtual bool Remove( int pos );
|
||||
|
||||
|
||||
void SetDimension( int x, int y, int width, int height );
|
||||
|
||||
|
||||
wxSize GetSize()
|
||||
{ return m_size; }
|
||||
wxPoint GetPosition()
|
||||
@ -111,17 +118,20 @@ public:
|
||||
|
||||
virtual void RecalcSizes() = 0;
|
||||
virtual wxSize CalcMin() = 0;
|
||||
|
||||
|
||||
virtual void Layout();
|
||||
|
||||
void Fit( wxWindow *window );
|
||||
void SetSizeHints( wxWindow *window );
|
||||
|
||||
|
||||
wxList& GetChildren()
|
||||
{ return m_children; }
|
||||
|
||||
protected:
|
||||
wxSize m_size;
|
||||
wxPoint m_position;
|
||||
wxList m_children;
|
||||
|
||||
|
||||
wxSize GetMinWindowSize( wxWindow *window );
|
||||
};
|
||||
|
||||
@ -131,15 +141,16 @@ protected:
|
||||
|
||||
class WXDLLEXPORT wxBoxSizer: public wxSizer
|
||||
{
|
||||
DECLARE_CLASS(wxBoxSizer);
|
||||
public:
|
||||
wxBoxSizer( int orient );
|
||||
|
||||
|
||||
void RecalcSizes();
|
||||
wxSize CalcMin();
|
||||
|
||||
|
||||
int GetOrientation()
|
||||
{ return m_orient; }
|
||||
|
||||
|
||||
protected:
|
||||
int m_orient;
|
||||
int m_stretchable;
|
||||
@ -148,22 +159,23 @@ protected:
|
||||
int m_fixedWidth;
|
||||
int m_fixedHeight;
|
||||
};
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxStaticBoxSizer
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxStaticBoxSizer: public wxBoxSizer
|
||||
{
|
||||
DECLARE_CLASS(wxStaticBoxSizer);
|
||||
public:
|
||||
wxStaticBoxSizer( wxStaticBox *box, int orient );
|
||||
|
||||
|
||||
void RecalcSizes();
|
||||
wxSize CalcMin();
|
||||
|
||||
|
||||
wxStaticBox *GetStaticBox()
|
||||
{ return m_staticBox; }
|
||||
|
||||
|
||||
protected:
|
||||
wxStaticBox *m_staticBox;
|
||||
};
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
// Purpose: provide new wxSizer class for layout
|
||||
// Author: Robert Roebling and Robin Dunn
|
||||
// Modified by:
|
||||
// Created:
|
||||
// Created:
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Robin Dunn, Dirk Holtwick and Robert Roebling
|
||||
// Licence: wxWindows licence
|
||||
@ -24,56 +24,75 @@
|
||||
#include "wx/utils.h"
|
||||
#include "wx/statbox.h"
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxSizerItem, wxObject);
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
// wxSizerItem
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border )
|
||||
wxSizerItem::wxSizerItem( int width, int height, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_window = (wxWindow *) NULL;
|
||||
m_sizer = (wxSizer *) NULL;
|
||||
m_option = option;
|
||||
m_border = border;
|
||||
m_flag = flag;
|
||||
|
||||
m_userData = userData;
|
||||
|
||||
// minimal size is the initial size
|
||||
m_minSize.x = width;
|
||||
m_minSize.y = height;
|
||||
|
||||
|
||||
// size is set directly
|
||||
m_size = m_minSize;
|
||||
}
|
||||
|
||||
wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border )
|
||||
wxSizerItem::wxSizerItem( wxWindow *window, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
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
|
||||
m_minSize = window->GetSize();
|
||||
|
||||
|
||||
// size is calculated later
|
||||
// m_size = ...
|
||||
}
|
||||
|
||||
wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border )
|
||||
wxSizerItem::wxSizerItem( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_window = (wxWindow *) NULL;
|
||||
m_sizer = sizer;
|
||||
m_option = option;
|
||||
m_border = border;
|
||||
m_flag = flag;
|
||||
|
||||
m_userData = userData;
|
||||
|
||||
// minimal size is calculated later
|
||||
// m_minSize = ...
|
||||
|
||||
|
||||
// size is calculated later
|
||||
// m_size = ...
|
||||
}
|
||||
|
||||
wxSizerItem::~wxSizerItem()
|
||||
{
|
||||
if (m_userData)
|
||||
delete m_userData;
|
||||
if (m_sizer)
|
||||
delete m_sizer;
|
||||
}
|
||||
|
||||
|
||||
wxSize wxSizerItem::GetSize()
|
||||
{
|
||||
wxSize ret;
|
||||
@ -83,7 +102,7 @@ wxSize wxSizerItem::GetSize()
|
||||
if (IsWindow())
|
||||
ret = m_window->GetSize();
|
||||
else ret = m_size;
|
||||
|
||||
|
||||
if (m_flag & wxWEST)
|
||||
ret.x += m_border;
|
||||
if (m_flag & wxEAST)
|
||||
@ -92,7 +111,7 @@ wxSize wxSizerItem::GetSize()
|
||||
ret.y += m_border;
|
||||
if (m_flag & wxSOUTH)
|
||||
ret.y += m_border;
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -101,17 +120,17 @@ wxSize wxSizerItem::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())
|
||||
ret = m_window->GetSize();
|
||||
*/
|
||||
else ret = m_minSize;
|
||||
|
||||
|
||||
if (m_flag & wxWEST)
|
||||
ret.x += m_border;
|
||||
if (m_flag & wxEAST)
|
||||
@ -120,7 +139,7 @@ wxSize wxSizerItem::CalcMin()
|
||||
ret.y += m_border;
|
||||
if (m_flag & wxSOUTH)
|
||||
ret.y += m_border;
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -144,10 +163,10 @@ void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
|
||||
{
|
||||
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 );
|
||||
|
||||
@ -181,41 +200,41 @@ wxSizer::wxSizer()
|
||||
wxSizer::~wxSizer()
|
||||
{
|
||||
}
|
||||
|
||||
void wxSizer::Add( wxWindow *window, int option, int flag, int border )
|
||||
|
||||
void wxSizer::Add( wxWindow *window, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_children.Append( new wxSizerItem( window, option, flag, border ) );
|
||||
m_children.Append( new wxSizerItem( window, option, flag, border, userData ) );
|
||||
}
|
||||
|
||||
void wxSizer::Add( wxSizer *sizer, int option, int flag, int border )
|
||||
void wxSizer::Add( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_children.Append( new wxSizerItem( sizer, option, flag, border ) );
|
||||
m_children.Append( new wxSizerItem( sizer, option, flag, border, userData ) );
|
||||
}
|
||||
|
||||
void wxSizer::Add( int width, int height, int option, int flag, int border )
|
||||
void wxSizer::Add( int width, int height, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_children.Append( new wxSizerItem( width, height, option, flag, border ) );
|
||||
m_children.Append( new wxSizerItem( width, height, option, flag, border, userData ) );
|
||||
}
|
||||
|
||||
void wxSizer::Prepend( wxWindow *window, int option, int flag, int border )
|
||||
void wxSizer::Prepend( wxWindow *window, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_children.Insert( new wxSizerItem( window, option, flag, border ) );
|
||||
m_children.Insert( new wxSizerItem( window, option, flag, border, userData ) );
|
||||
}
|
||||
|
||||
void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border )
|
||||
void wxSizer::Prepend( wxSizer *sizer, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_children.Insert( new wxSizerItem( sizer, option, flag, border ) );
|
||||
m_children.Insert( new wxSizerItem( sizer, option, flag, border, userData ) );
|
||||
}
|
||||
|
||||
void wxSizer::Prepend( int width, int height, int option, int flag, int border )
|
||||
void wxSizer::Prepend( int width, int height, int option, int flag, int border, wxObject* userData )
|
||||
{
|
||||
m_children.Insert( new wxSizerItem( width, height, option, flag, border ) );
|
||||
m_children.Insert( new wxSizerItem( width, height, option, flag, border, userData ) );
|
||||
}
|
||||
|
||||
bool wxSizer::Remove( wxWindow *window )
|
||||
{
|
||||
wxASSERT( window );
|
||||
|
||||
|
||||
wxNode *node = m_children.First();
|
||||
while (node)
|
||||
{
|
||||
@ -227,14 +246,14 @@ bool wxSizer::Remove( wxWindow *window )
|
||||
}
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
bool wxSizer::Remove( wxSizer *sizer )
|
||||
{
|
||||
wxASSERT( sizer );
|
||||
|
||||
|
||||
wxNode *node = m_children.First();
|
||||
while (node)
|
||||
{
|
||||
@ -246,7 +265,7 @@ bool wxSizer::Remove( wxSizer *sizer )
|
||||
}
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -254,12 +273,12 @@ bool wxSizer::Remove( int pos )
|
||||
{
|
||||
wxNode *node = m_children.Nth( pos );
|
||||
if (!node) return FALSE;
|
||||
|
||||
|
||||
m_children.DeleteNode( node );
|
||||
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
void wxSizer::Fit( wxWindow *window )
|
||||
{
|
||||
window->SetSize( GetMinWindowSize( window ) );
|
||||
@ -283,7 +302,7 @@ wxSize wxSizer::GetMinWindowSize( wxWindow *window )
|
||||
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 );
|
||||
minSize.y+size.y-client_size.y );
|
||||
}
|
||||
|
||||
void wxSizer::SetDimension( int x, int y, int width, int height )
|
||||
@ -309,7 +328,7 @@ void wxBoxSizer::RecalcSizes()
|
||||
{
|
||||
if (m_children.GetCount() == 0)
|
||||
return;
|
||||
|
||||
|
||||
int delta = 0;
|
||||
int extra = 0;
|
||||
if (m_stretchable)
|
||||
@ -325,9 +344,9 @@ void wxBoxSizer::RecalcSizes()
|
||||
extra = (m_size.y - m_fixedHeight) % m_stretchable;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
wxPoint pt( m_position );
|
||||
|
||||
|
||||
wxNode *node = m_children.GetFirst();
|
||||
while (node)
|
||||
{
|
||||
@ -336,9 +355,9 @@ void wxBoxSizer::RecalcSizes()
|
||||
int weight = 1;
|
||||
if (item->GetOption())
|
||||
weight = item->GetOption();
|
||||
|
||||
|
||||
wxSize size( item->CalcMin() );
|
||||
|
||||
|
||||
if (m_orient == wxVERTICAL)
|
||||
{
|
||||
long height = size.y;
|
||||
@ -347,19 +366,19 @@ void wxBoxSizer::RecalcSizes()
|
||||
height = (delta * weight) + extra;
|
||||
extra = 0; // only the first item will get the remainder as extra size
|
||||
}
|
||||
|
||||
|
||||
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
|
||||
@ -370,19 +389,19 @@ void wxBoxSizer::RecalcSizes()
|
||||
width = (delta * weight) + extra;
|
||||
extra = 0; // only the first item will get the remainder as extra size
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@ -394,24 +413,24 @@ wxSize wxBoxSizer::CalcMin()
|
||||
{
|
||||
if (m_children.GetCount() == 0)
|
||||
return wxSize(2,2);
|
||||
|
||||
|
||||
m_stretchable = 0;
|
||||
m_minWidth = 0;
|
||||
m_minHeight = 0;
|
||||
m_fixedWidth = 0;
|
||||
m_fixedHeight = 0;
|
||||
|
||||
|
||||
wxNode *node = m_children.GetFirst();
|
||||
while (node)
|
||||
{
|
||||
wxSizerItem *item = (wxSizerItem*) node->Data();
|
||||
|
||||
|
||||
int weight = 1;
|
||||
if (item->GetOption())
|
||||
weight = item->GetOption();
|
||||
|
||||
|
||||
wxSize size( item->CalcMin() );
|
||||
|
||||
|
||||
if (m_orient == wxHORIZONTAL)
|
||||
{
|
||||
m_minWidth += (size.x * weight);
|
||||
@ -422,7 +441,7 @@ wxSize wxBoxSizer::CalcMin()
|
||||
m_minHeight += (size.y * weight);
|
||||
m_minWidth = wxMax( m_minWidth, size.x );
|
||||
}
|
||||
|
||||
|
||||
if (item->GetOption())
|
||||
{
|
||||
m_stretchable += weight;
|
||||
@ -440,10 +459,10 @@ wxSize wxBoxSizer::CalcMin()
|
||||
m_fixedHeight = wxMax( m_fixedHeight, size.y );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
node = node->Next();
|
||||
}
|
||||
|
||||
|
||||
return wxSize( m_minWidth, m_minHeight );
|
||||
}
|
||||
|
||||
@ -455,10 +474,10 @@ 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
|
||||
@ -469,16 +488,16 @@ void wxStaticBoxSizer::RecalcSizes()
|
||||
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;
|
||||
}
|
||||
@ -491,10 +510,10 @@ wxSize wxStaticBoxSizer::CalcMin()
|
||||
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;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user