X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bd52bee1062faef26287d2f5a2595a9d8ee4d85a..e7e91e03584a8e2582e7efd32a06f9f79ef65a52:/src/common/nbkbase.cpp diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index c493e02380..527fcc27db 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -91,10 +91,17 @@ wxSize wxNotebookBase::CalcSizeFromPage(const wxSize& sizePage) // this was just taken from wxNotebookSizer::CalcMin() and is, of // course, totally bogus - just like the original code was wxSize sizeTotal = sizePage; + if ( HasFlag(wxNB_LEFT) || HasFlag(wxNB_RIGHT) ) + { sizeTotal.x += 90; + sizeTotal.y += 10; + } else + { + sizeTotal.x += 10; sizeTotal.y += 40; + } return sizeTotal; } @@ -120,7 +127,7 @@ wxNotebookPage *wxNotebookBase::DoRemovePage(int nPage) _T("invalid page index in wxNotebookBase::DoRemovePage()") ); wxNotebookPage *pageRemoved = m_pages[nPage]; - m_pages.Remove(nPage); + m_pages.RemoveAt(nPage); return pageRemoved; }