X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/befee9b7138622434d29acf09427d69a1e7c68ee..b404a8f3b072129c107c6d9a5e0f6f53cd34807b:/src/msw/bmpcbox.cpp

diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 6ae9044a2d..c2928c9657 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/msw/bmpcboxg.cpp
+// Name:        src/msw/bmpcbox.cpp
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-04-06
@@ -131,6 +131,7 @@ void wxBitmapComboBox::RecreateControl()
     wxString value = GetValue();
     wxPoint pos = GetPosition();
     wxSize size = GetSize();
+    size.y = GetBestSize().y;
     wxArrayString strings = GetStrings();
 
     wxComboBox::DoClear();
@@ -139,7 +140,7 @@ void wxBitmapComboBox::RecreateControl()
     DissociateHandle();
     ::DestroyWindow(hwnd);
 
-    if ( !MSWCreateControl(wxT("COMBOBOX"), value, pos, size) )
+    if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )
         return;
 
     // initialize the controls contents
@@ -176,6 +177,12 @@ void wxBitmapComboBox::RecreateControl()
     {
         SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     }
+
+    ::SendMessage(GetHwnd(), CB_SETITEMHEIGHT, 0, MeasureItem(0));
+
+    // Revert the old string value
+    if ( !HasFlag(wxCB_READONLY) )
+        ChangeValue(value);
 }
 
 wxBitmapComboBox::~wxBitmapComboBox()
@@ -183,6 +190,20 @@ wxBitmapComboBox::~wxBitmapComboBox()
     Clear();
 }
 
+wxSize wxBitmapComboBox::DoGetBestSize() const
+{
+    wxSize best = wxComboBox::DoGetBestSize();
+    wxSize bitmapSize = GetBitmapSize();
+
+    wxCoord useHeightBitmap = EDIT_HEIGHT_FROM_CHAR_HEIGHT(bitmapSize.y);
+    if ( best.y < useHeightBitmap )
+    {
+        best.y = useHeightBitmap;
+        CacheBestSize(best);
+    }
+    return best;
+}
+
 // ----------------------------------------------------------------------------
 // Item manipulation
 // ----------------------------------------------------------------------------
@@ -294,7 +315,7 @@ bool wxBitmapComboBox::OnAddBitmap(const wxBitmap& bitmap)
 
         return true;
     }
-    
+
     return false;
 }
 
@@ -351,7 +372,7 @@ bool wxBitmapComboBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
     if ( pos == -1 )
         return FALSE;
 
-    int flags = 0;                
+    int flags = 0;
     if ( lpDrawItem->itemState & ODS_COMBOBOXEDIT )
         flags |= wxODCB_PAINTING_CONTROL;
     if ( lpDrawItem->itemState & ODS_SELECTED )