Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

second merge of the 2.2 branch (RL)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

306
src/common/sizer.cpp
View File

@@ -164,7 +164,7 @@ wxSize wxSizerItem::CalcMin()
void wxSizerItem::SetDimension( wxPoint pos, wxSize size )
{
m_pos = pos;
if (m_flag & wxWEST)
{
pos.x += m_border;
@@ -298,11 +298,11 @@ bool wxSizer::Remove( wxWindow *window )
while (node)
{
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetWindow() == window)
{
if (item->GetWindow() == window)
{
m_children.DeleteNode( node );
return TRUE;
}
return TRUE;
}
node = node->Next();
}
@@ -317,11 +317,11 @@ bool wxSizer::Remove( wxSizer *sizer )
while (node)
{
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer() == sizer)
{
if (item->GetSizer() == sizer)
{
m_children.DeleteNode( node );
return TRUE;
}
return TRUE;
}
node = node->Next();
}
@@ -375,11 +375,11 @@ void wxSizer::SetDimension( int x, int y, int width, int height )
}
wxSize wxSizer::GetMinSize()
{
{
wxSize ret( CalcMin() );
if (ret.x < m_minSize.x) ret.x = m_minSize.x;
if (ret.y < m_minSize.y) ret.y = m_minSize.y;
return ret;
return ret;
}
void wxSizer::DoSetMinSize( int width, int height )
@@ -396,11 +396,11 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
while (node)
{
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetWindow() == window)
{
if (item->GetWindow() == window)
{
item->SetInitSize( width, height );
return TRUE;
}
return TRUE;
}
node = node->Next();
}
@@ -408,15 +408,15 @@ bool wxSizer::DoSetItemMinSize( wxWindow *window, int width, int height )
while (node)
{
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer())
{
if (item->GetSizer())
{
/* 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;
return TRUE;
}
}
}
node = node->Next();
}
@@ -431,11 +431,11 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
while (node)
{
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer() == sizer)
{
if (item->GetSizer() == sizer)
{
item->GetSizer()->DoSetMinSize( width, height );
return TRUE;
}
return TRUE;
}
node = node->Next();
}
@@ -443,15 +443,15 @@ bool wxSizer::DoSetItemMinSize( wxSizer *sizer, int width, int height )
while (node)
{
wxSizerItem *item = (wxSizerItem*)node->Data();
if (item->GetSizer())
{
if (item->GetSizer())
{
/* 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;
return TRUE;
}
}
}
node = node->Next();
}
@@ -471,7 +471,7 @@ bool wxSizer::DoSetItemMinSize( int pos, int width, int height )
}
else
{
/* ... whereas the minimal size of spacers and windows in stored
/* ... whereas the minimal size of spacers and windows in stored
in the item */
item->SetInitSize( width, height );
}
@@ -515,9 +515,9 @@ void wxGridSizer::RecalcSizes()
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 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++)
@@ -530,7 +530,7 @@ void wxGridSizer::RecalcSizes()
{
wxNode *node = m_children.Nth( i );
wxASSERT( node );
SetItemBounds( (wxSizerItem*) node->Data(), x, y, w, h);
}
y = y + h + m_vgap;
@@ -556,7 +556,7 @@ wxSize wxGridSizer::CalcMin()
/* Find the max width and height for any component */
int w = 0;
int h = 0;
wxNode *node = m_children.First();
while (node)
{
@@ -564,10 +564,10 @@ wxSize wxGridSizer::CalcMin()
wxSize sz( item->CalcMin() );
w = wxMax( w, sz.x );
h = wxMax( h, sz.y );
node = node->Next();
}
return wxSize(ncols * w + (ncols-1) * m_hgap,
nrows * h + (nrows-1) * m_vgap);
}
@@ -592,7 +592,7 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
{
pt.x = x + (w - sz.x);
}
if (flag & wxALIGN_CENTER_VERTICAL)
{
pt.y = y + (h - sz.y) / 2;
@@ -602,7 +602,7 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
pt.y = y + (h - sz.y);
}
}
item->SetDimension(pt, sz);
}
@@ -612,18 +612,18 @@ void wxGridSizer::SetItemBounds( wxSizerItem *item, int x, int y, int w, int h )
wxFlexGridSizer::wxFlexGridSizer( int rows, int cols, int vgap, int hgap )
: wxGridSizer( rows, cols, vgap, hgap )
{
{
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_rowHeights = (int*) NULL;
m_colWidths = (int*) NULL;
}
wxFlexGridSizer::~wxFlexGridSizer()
{
if (m_rowHeights)
@@ -638,10 +638,10 @@ void wxFlexGridSizer::CreateArrays()
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;
@@ -653,7 +653,7 @@ void wxFlexGridSizer::CreateArrays()
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++)
@@ -686,14 +686,14 @@ void wxFlexGridSizer::RecalcSizes()
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;
}
sz = wxSize( pt.x + sz.x, pt.y + sz.y );
int x = pt.x;
@@ -707,10 +707,10 @@ void wxFlexGridSizer::RecalcSizes()
{
wxNode *node = m_children.Nth( i );
wxASSERT( 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);
}
y = y + m_rowHeights[r] + m_vgap;
@@ -734,10 +734,10 @@ wxSize wxFlexGridSizer::CalcMin()
ncols = (nitems + nrows-1) / nrows;
CreateArrays();
int col;
int row;
int i = 0;
wxNode *node = m_children.First();
while (node)
@@ -748,19 +748,19 @@ wxSize wxFlexGridSizer::CalcMin()
col = i % ncols;
m_rowHeights[ row ] = wxMax( sz.y, m_rowHeights[ row ] );
m_colWidths[ col ] = wxMax( sz.x, m_colWidths[ col ] );
node = node->Next();
i++;
}
int width = 0;
for (col = 0; col < ncols; col++)
width += m_colWidths[ col ];
int height = 0;
for (row = 0; row < nrows; row++)
height += m_rowHeights[ row ];
return wxSize( width + (ncols-1) * m_hgap,
height + (nrows-1) * m_vgap);
}
@@ -770,7 +770,7 @@ void wxFlexGridSizer::AddGrowableRow( size_t idx )
m_growableRows.Add( idx );
}
void wxFlexGridSizer::RemoveGrowableRow( size_t idx )
void wxFlexGridSizer::RemoveGrowableRow( size_t WXUNUSED(idx) )
{
}
@@ -779,7 +779,7 @@ void wxFlexGridSizer::AddGrowableCol( size_t idx )
m_growableCols.Add( idx );
}
void wxFlexGridSizer::RemoveGrowableCol( size_t idx )
void wxFlexGridSizer::RemoveGrowableCol( size_t WXUNUSED(idx) )
{
}
@@ -805,12 +805,12 @@ void wxBoxSizer::RecalcSizes()
{
delta = (m_size.x - m_fixedWidth) / m_stretchable;
extra = (m_size.x - m_fixedWidth) % m_stretchable;
}
else
{
}
else
{
delta = (m_size.y - m_fixedHeight) / m_stretchable;
extra = (m_size.y - m_fixedHeight) % m_stretchable;
}
}
}
wxPoint pt( m_position );
@@ -820,64 +820,64 @@ void wxBoxSizer::RecalcSizes()
{
wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1;
if (item->GetOption())
weight = item->GetOption();
int weight = 1;
if (item->GetOption())
weight = item->GetOption();
wxSize size( item->CalcMin() );
wxSize size( item->CalcMin() );
if (m_orient == wxVERTICAL)
{
wxCoord height = size.y;
if (item->GetOption())
{
height = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size
}
if (m_orient == wxVERTICAL)
{
wxCoord height = size.y;
if (item->GetOption())
{
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) );
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;
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 );
item->SetDimension( child_pos, child_size );
pt.y += height;
}
else
{
wxCoord width = size.x;
if (item->GetOption())
{
width = (delta * weight) + extra;
extra = 0; // only the first item will get the remainder as extra size
}
pt.y += height;
}
else
{
wxCoord width = size.x;
if (item->GetOption())
{
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) );
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;
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 );
item->SetDimension( child_pos, child_size );
pt.x += width;
}
pt.x += width;
}
node = node->Next();
node = node->Next();
}
}
@@ -897,42 +897,42 @@ wxSize wxBoxSizer::CalcMin()
{
wxSizerItem *item = (wxSizerItem*) node->Data();
int weight = 1;
if (item->GetOption())
weight = item->GetOption();
int weight = 1;
if (item->GetOption())
weight = item->GetOption();
wxSize size( item->CalcMin() );
wxSize size( item->CalcMin() );
if (m_orient == wxHORIZONTAL)
{
m_minWidth += (size.x * weight);
m_minHeight = wxMax( m_minHeight, size.y );
}
else
{
m_minHeight += (size.y * weight);
m_minWidth = wxMax( m_minWidth, size.x );
}
if (m_orient == wxHORIZONTAL)
{
m_minWidth += (size.x * weight);
m_minHeight = wxMax( m_minHeight, size.y );
}
else
{
m_minHeight += (size.y * weight);
m_minWidth = wxMax( m_minWidth, size.x );
}
if (item->GetOption())
{
m_stretchable += weight;
}
else
{
if (m_orient == wxVERTICAL)
{
m_fixedHeight += size.y;
m_fixedWidth = wxMax( m_fixedWidth, size.x );
}
else
{
m_fixedWidth += size.x;
m_fixedHeight = wxMax( m_fixedHeight, size.y );
}
}
if (item->GetOption())
{
m_stretchable += weight;
}
else
{
if (m_orient == wxVERTICAL)
{
m_fixedHeight += size.y;
m_fixedWidth = wxMax( m_fixedWidth, size.x );
}
else
{
m_fixedWidth += size.x;
m_fixedHeight = wxMax( m_fixedHeight, size.y );
}
}
node = node->Next();
node = node->Next();
}
return wxSize( m_minWidth, m_minHeight );
@@ -979,7 +979,7 @@ 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;
@@ -1000,7 +1000,7 @@ wxSize wxStaticBoxSizer::CalcMin()
wxNotebookSizer::wxNotebookSizer( wxNotebook *nb )
{
wxASSERT_MSG( nb, wxT("wxNotebookSizer needs a notebook") );
m_notebook = nb;
}
@@ -1014,7 +1014,7 @@ wxSize wxNotebookSizer::CalcMin()
// This will have to be done platform by platform
// as there is no way to guess the thickness of
// the wxNotebook tabs and border.
int borderX = 5;
int borderY = 5;
if ((m_notebook->HasFlag(wxNB_RIGHT)) ||
@@ -1026,7 +1026,7 @@ wxSize wxNotebookSizer::CalcMin()
{
borderY += 40; // improvements later..
}
if (m_notebook->GetChildren().GetCount() == 0)
return wxSize(borderX + 10, borderY + 10);
@@ -1037,17 +1037,17 @@ wxSize wxNotebookSizer::CalcMin()
while (node)
{
wxWindow *item = node->GetData();
wxSizer *itemsizer = item->GetSizer();
if (itemsizer)
{
wxSize subsize( itemsizer->CalcMin() );
if (subsize.x > maxX) maxX = subsize.x;
if (subsize.y > maxY) maxY = subsize.y;
}
wxSizer *itemsizer = item->GetSizer();
node = node->GetNext();
if (itemsizer)
{
wxSize subsize( itemsizer->CalcMin() );
if (subsize.x > maxX) maxX = subsize.x;
if (subsize.y > maxY) maxY = subsize.y;
}
node = node->GetNext();
}
return wxSize( borderX + maxX, borderY + maxY );