2009-11-11 Carlos Alberto Cortez <calberto.cortez@gmail.com>

* ComboBox.cs: When setting Text and data source is being used, if the passed value is not matching any of the items in the source, don't pass it to GetItemText, since it's useless, as GetItemText expects a valid item. Fixes #546009. svn path=/branches/mono-2-4/mcs/; revision=145935
baulig · Nov 11, 2009 · d96eb88 · d96eb88
1 parent eb6d24a
commit d96eb88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-11  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+	* ComboBox.cs: When setting Text and data source is being used, if the
+	passed value is not matching any of the items in the source, don't
+	pass it to GetItemText, since it's useless, as GetItemText expects a
+	valid item.
+	Fixes #546009.
+
 2009-10-30  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
 [merge -r 142756:144751 from trunk, which basically contains ListView related

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ComboBox.cs
@@ -809,8 +809,9 @@ void SetTextBoxAutoCompleteData ()
 					return;
 				}
 
+				// set directly the passed value, since we already know it's not matching any item
 				if (dropdown_style != ComboBoxStyle.DropDownList)
-					textbox_ctrl.Text = GetItemText (value);
+					textbox_ctrl.Text = value;
 			}
 		}