From bd423096df59631b8423214ec76efe6f86af2308 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 20 Sep 2021 19:37:12 +0200 Subject: [PATCH] Restore recently removed #include wx/textctrl.h in wx/combobox.h Some existing code relies on wxEVT_TEXT being defined after including just wx/combobox.h too, so just keep this formally unnecessary but by now impossible to remove #include removed in d3eafa4d18 (Fix compilation of wxFormBuilder-generated code using wxTE_XXX, 2021-07-14). See #14132. Closes #19264. --- include/wx/combobox.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/wx/combobox.h b/include/wx/combobox.h index 393d1ba599..35d7368c60 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -15,6 +15,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[]; // ----------------------------------------------------------------------------