1 files changed, 9 insertions, 0 deletions

diff --git a/CPP/Windows/Control/ComboBox.cpp b/CPP/Windows/Control/ComboBox.cpp
index 8da487d..2e9c8cb 100644
--- a/CPP/Windows/Control/ComboBox.cpp
+++ b/CPP/Windows/Control/ComboBox.cpp
@@ -63,4 +63,13 @@ LRESULT CComboBox::GetLBText(int index, UString &s)
 }
 #endif
 
+LRESULT CComboBox::AddString_SetItemData(LPCWSTR s, LPARAM lParam)
+{
+  const LRESULT index = AddString(s);
+  // NOTE: SetItemData((int)-1, lParam) works as unexpected.
+  if (index >= 0) // optional check, because (index < 0) is not expected for normal inputs
+    SetItemData((int)index, lParam);
+  return index;
+}
+
 }}