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

compilation fix for Mac and reformatted the code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-06-01 15:15:09 +00:00
parent 5706de1cf4
commit 550e6c014c
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/nbkbase.cpp
View File

@@ -98,21 +98,16 @@ void wxNotebookBase::AssignImageList(wxImageList* imageList)
wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) const
{ {
// this was just taken from wxNotebookSizer::CalcMin() and is, of // this is, of course, totally bogus -- but we must do something by
// course, totally bogus - just like the original code was // default because not all ports implement this
wxSize sizeTotal = sizePage; wxSize sizeTotal = sizePage;
// changed hajokirchhoff -- May, 31st, 2003
// moved the __WXMSW__ portion to wxNotebook::CalcSizeFromPage in src/msw/notebook.cpp
// where it really belongs.
// Question: Shouldn't we make wxNotebookBase::CalcSizeFromPage a pure virtual class.
// I'd like this better than this "totally bogus" code here.
if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) ) if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) )
{ {
sizeTotal.x += 90; sizeTotal.x += 90;
sizeTotal.y += 10; sizeTotal.y += 10;
} }
else else // tabs on top/bottom side
{ {
sizeTotal.x += 10; sizeTotal.x += 10;
sizeTotal.y += 40; sizeTotal.y += 40;
@@ -151,13 +146,20 @@ wxSize wxNotebookBase::DoGetBestSize() const
{ {
wxSize bestSize(0,0); wxSize bestSize(0,0);
size_t nCount = m_pages.Count(); size_t nCount = m_pages.Count();
// iterate over all pages, get the largest width and height // iterate over all pages, get the largest width and height
for ( size_t nPage = 0; nPage < nCount; nPage++ ) { for ( size_t nPage = 0; nPage < nCount; nPage++ )
{
wxNotebookPage *pPage = m_pages[nPage]; wxNotebookPage *pPage = m_pages[nPage];
wxSize childBestSize(pPage->GetBestSize()); wxSize childBestSize(pPage->GetBestSize());
bestSize.SetWidth(max(childBestSize.GetWidth(), bestSize.GetWidth()));
bestSize.SetHeight(max(childBestSize.GetHeight(), bestSize.GetHeight())); if ( childBestSize.x > bestSize.x )
bestSize.x = childBestSize.x;
if ( childBestSize.y > bestSize.y )
bestSize.y = childBestSize.y;
} }
// convert display area to window area, adding the size neccessary for the tab control itself // convert display area to window area, adding the size neccessary for the tab control itself
return CalcSizeFromPage(bestSize); return CalcSizeFromPage(bestSize);
} }