reverted Julian's unintentional breakage of wxChoice

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

src/msw/choice.cpp

@@ -281,8 +281,7 @@ void wxChoice::DoSetSize(int x, int y,
     // the _displayed_ size (NOT the drop down menu size) so
     // setting-getting-setting size would not work.
 
-    wxSize sz = GetSize();
-    wxControl::DoSetSize(x, y, width, sz.y, sizeFlags);
+    wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 
 wxSize wxChoice::DoGetBestSize() const