take into account the controlling wxChoice size in GetBestSize() (closes #10394)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index 9ba0e545e4d808529915fa8356f4b22e096a9005..4b3194bcc0a161ea48657fc039b52d0f7e2ed919 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -143,11 +143,15 @@ wxSize wxChoicebook::CalcSizeFromPage(const wxSize& sizePage) const
     wxSize size = sizePage;
     if ( IsVertical() )
     {
     wxSize size = sizePage;
     if ( IsVertical() )
     {

+        if ( sizeChoice.x > sizePage.x )
+            size.x = sizeChoice.x;

         size.y += sizeChoice.y + GetInternalBorder();
     }
     else // left/right aligned
     {
         size.x += sizeChoice.x + GetInternalBorder();
         size.y += sizeChoice.y + GetInternalBorder();
     }
     else // left/right aligned
     {
         size.x += sizeChoice.x + GetInternalBorder();

+        if ( sizeChoice.y > sizePage.y )
+            size.y = sizeChoice.y;

     }
 
     return size;
     }
 
     return size;