X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/36a96421b31530604c9dcccc0ba2a2861359f462..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/combobox.h?ds=inline

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 831bed1c24..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[];
 
 // ----------------------------------------------------------------------------
@@ -53,8 +57,8 @@ public:
     virtual int GetSelection() const = 0;
     virtual void GetSelection(long *from, long *to) const = 0;
 
-    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); };
-    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); };
+    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
+    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
 
     // may return value different from GetSelection() when the combobox
     // dropdown is shown and the user selected, but not yet accepted, a value