deprecated Initialize/CleanUpClasses

[wxWidgets.git] / include / wx / ctrlsub.h

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 38b22f90fcee6157c2e516870dadcad9890e6eca..190156bc970fd42a5e62567266efb5d93fe1cd3e 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -6,13 +6,13 @@
 // 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
 
@@ -47,6 +47,11 @@ public:
     // append several items at once to the control
     void Append(const wxArrayString& strings);
 
+    int Insert(const wxString& item, int pos)
+        { return DoInsert(item, pos); }
+    int Insert(const wxString& item, int pos, void *clientData);
+    int Insert(const wxString& item, int pos, wxClientData *clientData);
+
     // deleting items
     // --------------
 
@@ -57,6 +62,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;
@@ -92,6 +99,7 @@ public:
 
 protected:
     virtual int DoAppend(const wxString& item) = 0;
+    virtual int DoInsert(const wxString& item, int pos) = 0;
 
     virtual void DoSetItemClientData(int n, void* clientData) = 0;
     virtual void* DoGetItemClientData(int n) const = 0;
@@ -105,6 +113,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
@@ -150,6 +161,9 @@ public:
     {
         return wxItemContainer::GetClientObject(n);
     }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxControlWithItems)
 };
 
 #endif // wxUSE_CONTROLS