X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e0bc921908ab73cac0cd14f00ac448c83fdec35..b448f30e9c884794601cecd87bb136d1edf5bb0f:/include/wx/ctrlsub.h diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 38b22f90fc..93ed78cfde 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 @@ -57,6 +57,8 @@ public: // ----------------- virtual int GetCount() const = 0; + bool IsEmpty() const { return GetCount() == 0; } + virtual wxString GetString(int n) const = 0; virtual void SetString(int n, const wxString& s) = 0; virtual int FindString(const wxString& s) const = 0; @@ -105,6 +107,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