Fix to prevent Assert when there is an empty string in a combobox/choice.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-08-18 06:27:58 +00:00
parent eb4642a989
commit 21d72d1755

View File

@@ -154,15 +154,15 @@ int wxChoice::FindString(const wxString& s) const
wxString wxChoice::GetString(int n) const
{
size_t len = (size_t)::SendMessage(GetHwnd(), CB_GETLBTEXTLEN, n, 0);
wxString str;
if ( ::SendMessage(GetHwnd(), CB_GETLBTEXT, n,
(LPARAM)str.GetWriteBuf(len)) == CB_ERR )
{
wxLogLastError("SendMessage(CB_GETLBTEXT)");
wxString str = "";
if (len) {
if ( ::SendMessage(GetHwnd(), CB_GETLBTEXT, n,
(LPARAM)str.GetWriteBuf(len)) == CB_ERR ) {
wxLogLastError("SendMessage(CB_GETLBTEXT)");
}
str.UngetWriteBuf();
}
str.UngetWriteBuf();
return str;
}