Made sure the 'best' size doesn't get set for wxChoice

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index fc53d9298daf0b914f3ff3b2845f503e1819197d..32b36c3603fd51618f724505ebebe7c270c9ea4f 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -280,7 +280,9 @@ void wxChoice::DoSetSize(int x, int y,
     // wxWindows interpretation is different; also, getting the size returns
     // the _displayed_ size (NOT the drop down menu size) so
     // setting-getting-setting size would not work.
     // wxWindows interpretation is different; also, getting the size returns
     // the _displayed_ size (NOT the drop down menu size) so
     // setting-getting-setting size would not work.

-    wxControl::DoSetSize(x, y, width, -1, sizeFlags);
+
+    wxSize sz = GetSize();
+    wxControl::DoSetSize(x, y, width, sz.y, sizeFlags);

 }
 
 wxSize wxChoice::DoGetBestSize() const
 }
 
 wxSize wxChoice::DoGetBestSize() const