From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Mar 2012 17:55:42 +0000 (+0000)
Subject: Include <wx/textctrl.h> from <wx/combobox.h> for compatibility.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2970f22a899a4b8fe2103dd79a7377f2f4a70c46

Include <wx/textctrl.h> from <wx/combobox.h> for compatibility.

The wxComboBox header itself doesn't need <wx/textctrl.h> but there exists
code using wxComboBox with wxTextCtrl styles and events that doesn't include
<wx/textctrl.h> explicitly because it wasn't necessary in 2.8. So include it
from wx/combobox.h to avoid breaking this code after an upgrade to 2.9.

Closes #14132.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index a1a8a4386c..f4dae22dcc 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -16,6 +16,10 @@
 
 #if wxUSE_COMBOBOX
 
+// For compatibility with 2.8 include this header to allow using wxTE_XXX
+// styles with wxComboBox without explicitly including it in the user code.
+#include "wx/textctrl.h"
+
 extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------