Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check that an error really occurred when getting wxChoice data in wxMSW.

Browse Source 
We could wrongly return NULL client data if -1 was stored as client data in
wxChoice because it's the same value as CB_ERR and we always interpreted it as
an error, while it may not be one if GetLastError() doesn't indicate it.

See #13883.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-01-20 22:11:39 +00:00
parent 04ca40fce8
commit 85a39457f9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/choice.cpp
View File

@@ -417,7 +417,7 @@ void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)
void* wxChoice::DoGetItemClientData(unsigned int n) const void* wxChoice::DoGetItemClientData(unsigned int n) const
{ {
LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0); LPARAM rc = SendMessage(GetHwnd(), CB_GETITEMDATA, n, 0);
if ( rc == CB_ERR ) if ( rc == CB_ERR && GetLastError() != ERROR_SUCCESS )
{ {
wxLogLastError(wxT("CB_GETITEMDATA")); wxLogLastError(wxT("CB_GETITEMDATA"));