change to a tiny minimal value for DoGetBestSize in case of existing entries

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index a53b5715cea7d8a82ca338c2e0de2ae51cd06dce..863b944cb4deed30a7f134c003ed2cfe847d6496 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -211,7 +211,7 @@ void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
 
 wxSize wxChoice::DoGetBestSize() const
 {
 
 wxSize wxChoice::DoGetBestSize() const
 {

-    int lbWidth = 100;  // some defaults
+    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults

     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON
     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index a53b5715cea7d8a82ca338c2e0de2ae51cd06dce..863b944cb4deed30a7f134c003ed2cfe847d6496 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -211,7 +211,7 @@ void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart )
 
 wxSize wxChoice::DoGetBestSize() const
 {
 
 wxSize wxChoice::DoGetBestSize() const
 {

-    int lbWidth = 100;  // some defaults
+    int lbWidth = GetCount() > 0 ? 20 : 100;  // some defaults

     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON
     int lbHeight = 20;
     int wLine;
 #if TARGET_CARBON