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

first pass of wxUniv merge - nothing works, most parts don't even compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/sizer.cpp
View File

@@ -32,7 +32,9 @@ IMPLEMENT_ABSTRACT_CLASS(wxSizer, wxObject);
IMPLEMENT_ABSTRACT_CLASS(wxGridSizer, wxSizer);
IMPLEMENT_ABSTRACT_CLASS(wxFlexGridSizer, wxGridSizer);
IMPLEMENT_ABSTRACT_CLASS(wxBoxSizer, wxSizer);
#if wxUSE_STATBOX
IMPLEMENT_ABSTRACT_CLASS(wxStaticBoxSizer, wxBoxSizer);
#endif
#if wxUSE_NOTEBOOK
IMPLEMENT_ABSTRACT_CLASS(wxNotebookSizer, wxSizer);
#endif
@@ -1017,6 +1019,8 @@ wxSize wxBoxSizer::CalcMin()
// wxStaticBoxSizer
//---------------------------------------------------------------------------
#if wxUSE_STATBOX
wxStaticBoxSizer::wxStaticBoxSizer( wxStaticBox *box, int orient )
: wxBoxSizer( orient )
{
@@ -1072,6 +1076,8 @@ wxSize wxStaticBoxSizer::CalcMin()
return ret;
}
#endif // wxUSE_STATBOX
//---------------------------------------------------------------------------
// wxNotebookSizer
//---------------------------------------------------------------------------
@@ -1092,24 +1098,15 @@ void wxNotebookSizer::RecalcSizes()
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.
wxSize sizeBorder = m_notebook->CalcSizeFromPage(wxSize(0, 0));
int borderX = 5;
int borderY = 5;
if ((m_notebook->HasFlag(wxNB_RIGHT)) ||
(m_notebook->HasFlag(wxNB_LEFT)))
{
borderX += 90; // improvements later..
}
else
{
borderY += 40; // improvements later..
}
sizeBorder.x += 5;
sizeBorder.y += 5;
if (m_notebook->GetChildren().GetCount() == 0)
return wxSize(borderX + 10, borderY + 10);
{
return wxSize(sizeBorder.x + 10, sizeBorder.y + 10);
}
int maxX = 0;
int maxY = 0;
@@ -1124,14 +1121,16 @@ wxSize wxNotebookSizer::CalcMin()
{
wxSize subsize( itemsizer->CalcMin() );
if (subsize.x > maxX) maxX = subsize.x;
if (subsize.y > maxY) maxY = subsize.y;
if (subsize.x > maxX)
maxX = subsize.x;
if (subsize.y > maxY)
maxY = subsize.y;
}
node = node->GetNext();
}
return wxSize( borderX + maxX, borderY + maxY );
return wxSize( maxX, maxY ) + sizeBorder;
}
#endif // wxUSE_NOTEBOOK