From 45e216bfe5d9698ce1c2ebf799837f502efaa0d7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Sep 2014 21:55:17 +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/trunk@77548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/bmpcbox.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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; }