From 5758832a6ee1f1b4ef6998f270bda7e19155f48c Mon Sep 17 00:00:00 2001
From: Maarten Bent <MaartenBent@users.noreply.github.com>
Date: Thu, 17 May 2018 19:44:38 +0200
Subject: [PATCH] Fix invalid image size in wxBitmapComboBox widgets sample

When the wxBitmapComboBox is empty, GetBitmapSize() returns size -1,-1.
Images can not be scaled to this invalid size. Use the size of the imagelist
instead.
---
 samples/widgets/bmpcombobox.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/samples/widgets/bmpcombobox.cpp b/samples/widgets/bmpcombobox.cpp
index 8c00519826..f73feb8978 100644
--- a/samples/widgets/bmpcombobox.cpp
+++ b/samples/widgets/bmpcombobox.cpp
@@ -694,6 +694,8 @@ void BitmapComboBoxWidgetsPage::LoadWidgetImages( wxArrayString* strings, wxImag
 
     // Get size of existing images in list
     wxSize foundSize = m_combobox->GetBitmapSize();
+    if ( !foundSize.IsFullySpecified() )
+        foundSize = images->GetSize();
 
     for ( i=0; i<strings->size(); i++ )
     {