From 9352652221189c82a84abb8a11d09e05b45d7c0a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Sep 2014 21:54:13 +0000 Subject: [PATCH] Fix empty wxBitmapComboBox height under wxMSW. Make (initially) empty wxBitmapComboBox as high as a normal wxComboBox instead of making it visibly shorter. Closes #14279. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + src/msw/bmpcbox.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/changes.txt b/docs/changes.txt index 8972a92a9c..b08252e252 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -614,6 +614,7 @@ wxMSW: - Fix font created using wxFont(wxFontInfo()) ctor. - Fix wxFileName::GetShortcutTarget() in console applications. - Fix wxFileName::MakeRelativeTo() for shortcut files (gafatoa). +- Fix height of initially empty wxBitmapComboBox (Artur Wieczorek). 3.0.1: (released 2014-06-15) diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp index f6d5950a02..8fc5bccced 100644 --- a/src/msw/bmpcbox.cpp +++ b/src/msw/bmpcbox.cpp @@ -449,7 +449,12 @@ bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item) LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT) item; int pos = lpMeasureItem->itemID; - lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos); + // Measure item height if item list is not empty, + // otherwise leave default system value. + if ( pos >= 0 ) + { + lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos); + } return TRUE; }