X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f11bdd03b9623a61bfe3137beeefd7b1256bb9a1..5d644707ca96dcaa63dc5a24c9eb5c2b7ee0b50d:/include/wx/ctrlsub.h diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 0fa00d4e64..1db128f7bc 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -32,6 +32,7 @@ class WXDLLEXPORT wxItemContainer { public: wxItemContainer() { m_clientDataItemsType = wxClientData_None; } + virtual ~wxItemContainer(); // adding items // ------------ @@ -43,6 +44,9 @@ public: int Append(const wxString& item, wxClientData *clientData) { int n = DoAppend(item); SetClientObject(n, clientData); return n; } + // append several items at once to the control + void Append(const wxArrayString& strings); + // deleting items // -------------- @@ -86,10 +90,6 @@ public: int Number() const { return GetCount(); } #endif // WXWIN_COMPATIBILITY_2_2 -#ifdef __DARWIN__ - virtual ~wxItemContainer() { } -#endif - protected: virtual int DoAppend(const wxString& item) = 0; @@ -105,6 +105,9 @@ protected: class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer { public: + wxControlWithItems() { } + virtual ~wxControlWithItems(); + // we have to redefine these functions here to avoid ambiguities in classes // deriving from us which would arise otherwise because both base classses // have the methods with the same names - hopefully, a smart compiler can