// Created: 22.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CTRLSUB_H_BASE_
#define _WX_CTRLSUB_H_BASE_
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "controlwithitems.h"
#endif
{
public:
wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
+ virtual ~wxItemContainer();
// adding items
// ------------
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
// --------------
// -----------------
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;
bool HasClientUntypedData() const
{ return m_clientDataItemsType == wxClientData_Void; }
-#if WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2_2
// compatibility - these functions are deprecated, use the new ones
// instead
int Number() const { return GetCount(); }
-#endif // WXWIN_COMPATIBILITY_2
-
-#ifdef __WXMAC_X__
- virtual ~wxItemContainer() {} // Added min for Mac X
-#endif
+#endif // WXWIN_COMPATIBILITY_2_2
protected:
virtual int DoAppend(const wxString& item) = 0;
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