From 9b3367a45f85ff2251db311dde4de6e422cadd9b Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Thu, 4 Feb 2016 21:40:21 +0100
Subject: [PATCH] Reset client data flag when wxOwnerDrawnComboBox contents is
 cleared.

When contents of wxOwnerDrawnComboBox with user data is cleared then client data type should be reset to wxClientData_None value.

See #15896.
---
 src/generic/odcombo.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index c1ef5b461f..71cc3ad5f8 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -587,6 +587,7 @@ void wxVListBoxComboPopup::ClearClientDatas()
     }
 
     m_clientDatas.Empty();
+    m_clientDataItemsType = wxClientData_None;
 }
 
 void wxVListBoxComboPopup::SetItemClientData( unsigned int n,
@@ -998,6 +999,7 @@ void wxOwnerDrawnComboBox::DoClear()
 void wxOwnerDrawnComboBox::Clear()
 {
     DoClear();
+    SetClientDataType(wxClientData_None);
 }
 
 void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)