In wxBitmapComboBox::RecreateControl(), only call ChangeValue() if the control doesn...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/bmpcbox.cpp b/src/msw/bmpcbox.cpp
index 52235a87798dd8d648f6c7dba88d25c1e948af3a..3ad1855abfb8e7b0a6b5ba2d001f10bf63036727 100644 (file)
--- 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()