From 3e8b0d8144313178d00a86768d18a4a772ee8bd7 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 15 Nov 2013 15:26:21 +0000 Subject: [PATCH] Fix blank wxComboBox appearance broken by the changes of r75134. We didn't repaint the owner drawn combobox items any more because they were not found by MSWFindItem(). Fix this by restricting the check to the real windows with the same ID as the combobox, not the dropdown items which are not windows at all. See #15674. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/combobox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 24f187036f..c4f0cb36b0 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -683,7 +683,7 @@ wxWindow *wxComboBox::MSWFindItem(long id, WXHWND hWnd) const // our own one. So we must explicitly check the HWND value too here and // avoid eating the events from the listbox as otherwise it is rendered // inoperative, see #15647. - if ( id == GetId() && hWnd != GetHWND() ) + if ( id == GetId() && hWnd && hWnd != GetHWND() ) { // Must be the case described above. return NULL;