From 1d98ac3039a26b86ec6519adb600888d46c49cca Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 15 Nov 2013 15:24:13 +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.

Closes #15674.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt     | 4 ++++
 src/msw/combobox.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index 1f282ab117..e71268c6a4 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -582,6 +582,10 @@ wxGTK:
 
 - Fix mouse wheel scrolling in wxListCtrl broken just before 3.0.0.
 
+wxMSW:
+
+- Fix blank wxBitmapComboBox dropdown appearance.
+
 
 3.0.0: (released 2013-11-11)
 ----------------------------
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;