X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/799ea01170e831c212320b0cb3038a91785e4789..61ecf6d34ffb087e4a02d1c4e29e1f155875eba0:/include/wx/ctrlsub.h diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index ac07defc27..0b98232f3d 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -12,7 +12,7 @@ #ifndef _WX_CTRLSUB_H_BASE_ #define _WX_CTRLSUB_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "controlwithitems.h" #endif @@ -44,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 // -------------- @@ -102,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