From 6341d8249f2952b8e19ddd208a42074eeed1f4dd Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 12 Feb 2004 16:45:28 +0000 Subject: [PATCH] fix yet another assert when the initial combo box value was empty (replaces patch 895470) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/combobox.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 3b7515c645..e62a0ed5a7 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -399,9 +399,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, validator, name) ) return FALSE; - // we shouldn't call SetValue() for an empty read only combobox as it would - // (correctly) thro an assert and is otherwise useless anyhow - if ( n || !HasFlag(wxCB_READONLY) ) + // we shouldn't call SetValue() for an empty string because this would + // (correctly) result in an assert with a read only combobox and is useless + // for the other ones anyhow + if ( !value.empty() ) SetValue(value); // a (not read only) combobox is, in fact, 2 controls: the combobox itself -- 2.45.2