From df541b86f86d91d51af013e3f43b632a3a8a28d9 Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Wed, 12 Jan 2011 17:58:09 +0000
Subject: [PATCH] In wxBitmapComboBox::RecreateControl(), only call
 ChangeValue() if the control doesn't have wxCB_READONLY style (fixes #12859)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/bmpcbox.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 52235a8779..3ad1855abf 100644
--- a/src/msw/bmpcbox.cpp
+++ b/src/msw/bmpcbox.cpp
@@ -181,7 +181,8 @@ void wxBitmapComboBox::RecreateControl()
     ::SendMessage(GetHwnd(), CB_SETITEMHEIGHT, 0, MeasureItem(0));
 
     // Revert the old string value
-    ChangeValue(value);
+    if ( !HasFlag(wxCB_READONLY) )
+        ChangeValue(value);
 }
 
 wxBitmapComboBox::~wxBitmapComboBox()
-- 
2.50.0