Win16 cursor/icon functions are not needed any longer

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index ac07defc279e08bc0280c65ad51e578949dc1c44..4052e56e87907b8ac7e818773e25189c78526133 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
 
@@ -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
     // --------------
 
@@ -54,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;
@@ -102,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