X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..6e3515377ca94ccc018f7a5ba8f185914081e601:/include/wx/combobox.h diff --git a/include/wx/combobox.h b/include/wx/combobox.h index ac02a10a32..ce7ba61aee 100644 --- a/include/wx/combobox.h +++ b/include/wx/combobox.h @@ -16,7 +16,7 @@ #if wxUSE_COMBOBOX -extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; // ---------------------------------------------------------------------------- // wxComboBoxBase: this interface defines the methods wxComboBox must implement @@ -25,17 +25,19 @@ extern WXDLLEXPORT_DATA(const char) wxComboBoxNameStr[]; #include "wx/ctrlsub.h" #include "wx/textentry.h" -class WXDLLEXPORT wxComboBoxBase : public wxItemContainer, +class WXDLLIMPEXP_CORE wxComboBoxBase : public wxItemContainer, public wxTextEntry { public: - // override this to disambiguate between two base classes versions + // override these methods to disambiguate between two base classes versions virtual void Clear() { wxTextEntry::Clear(); wxItemContainer::Clear(); } + bool IsEmpty() const { return wxItemContainer::IsEmpty(); } + // also bring in GetSelection() versions of both base classes in scope // // NB: GetSelection(from, to) could be already implemented in wxTextEntry