diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-01-14 10:40:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-01-14 16:04:17 +0000 |
| commit | 830f44b1ca0e121d3e27a031054313e3f194ab1d (patch) | |
| tree | 5e278495b667b8ca36d10770dc07d32134954e80 /vcl/source/window/tabpage.cxx | |
| parent | d652af7d071bb5e5c3f7592d6dc7e7c400e711d3 (diff) | |
we only ever want the preferred window size from GetOptimalSize
so remove the MAX and MIN options and simplify the whole lot
Change-Id: Iaaf350c37e01f7fce434af760bcddb9b7d7135ea
Diffstat (limited to 'vcl/source/window/tabpage.cxx')
| -rw-r--r-- | vcl/source/window/tabpage.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 5f04373db18a..b15d9c1ea09a 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -207,16 +207,11 @@ bool TabPage::isLayoutEnabled() const return pChild && isContainerWindow(*pChild) && !pChild->GetWindow(WINDOW_NEXT); } -Size TabPage::GetOptimalSize(WindowSizeType eType) const +Size TabPage::GetOptimalSize() const { - if (eType == WINDOWSIZE_MAXIMUM) - return Window::GetOptimalSize(eType); - Size aSize; if (isLayoutEnabled()) - aSize = GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(eType); - else - aSize = getLegacyBestSizeForChildren(*this); - return Window::CalcWindowSize(aSize); + return GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(); + return getLegacyBestSizeForChildren(*this); } void TabPage::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) |