Add functor-taking overload of CallAfter().

[wxWidgets.git] / include / wx / combobox.h

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index 831bed1c242f6b1ab302c7c7a8588dbfb1ea6020..f4dae22dcc1b7e1e9fe3a32953d3c9155f4b9910 100644 (file)
--- 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