tabpages size req not factoring in border width

Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1

vcl/source/control/tabctrl.cxx

@@ -29,6 +29,7 @@
 #include "vcl/tabpage.hxx"
 #include "vcl/tabctrl.hxx"
 #include "vcl/controllayout.hxx"
+#include "vcl/layout.hxx"
 #include "vcl/lstbox.hxx"
 
 #include "controldata.hxx"
@@ -2219,7 +2220,7 @@ Size TabControl::calculateRequisition() const
         if (!pPage)
             continue;
 
-        Size aPageSize(pPage->GetOptimalSize());
+        Size aPageSize(VclContainer::getLayoutRequisition(*pPage));
 
         if (aPageSize.Width() > aOptimalPageSize.Width())
             aOptimalPageSize.Width() = aPageSize.Width();

vcl/source/window/tabpage.cxx

@@ -210,7 +210,7 @@ bool TabPage::isLayoutEnabled() const
 Size TabPage::GetOptimalSize() const
 {
     if (isLayoutEnabled())
-        return GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize();
+        return VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD));
     return getLegacyBestSizeForChildren(*this);
 }