In wxBitmapComboBox::RecreateControl(), always get recreated control's height from...

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

diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 8e6496094a988cee3d63e0b8d9cd8748cdf236d3..19a5d3a050b53395d4a9fc2f209643247e092708 100644 (file)
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -131,6 +131,7 @@ void wxBitmapComboBox::RecreateControl()
     wxString value = GetValue();
     wxPoint pos = GetPosition();
     wxSize size = GetSize();
     wxString value = GetValue();
     wxPoint pos = GetPosition();
     wxSize size = GetSize();

+    size.y = GetBestSize().y;

     wxArrayString strings = GetStrings();
 
     wxComboBox::DoClear();
     wxArrayString strings = GetStrings();
 
     wxComboBox::DoClear();


@@ -176,6 +177,8 @@ void wxBitmapComboBox::RecreateControl()
     {
         SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     }
     {
         SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     }

+
+    ::SendMessage(GetHwnd(), CB_SETITEMHEIGHT, 0, MeasureItem(0));

 }
 
 wxBitmapComboBox::~wxBitmapComboBox()
 }
 
 wxBitmapComboBox::~wxBitmapComboBox()