use the native wxImageList under Win32 as otherwise xUniv doesn't link currently

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index 0fa00d4e64e7483906165a72020e70ce7b898a94..38b22f90fcee6157c2e516870dadcad9890e6eca 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -32,6 +32,7 @@ class WXDLLEXPORT wxItemContainer
 {
 public:
     wxItemContainer() { m_clientDataItemsType = wxClientData_None; }
 {
 public:
     wxItemContainer() { m_clientDataItemsType = wxClientData_None; }

+    virtual ~wxItemContainer();

 
     // adding items
     // ------------
 
     // adding items
     // ------------


@@ -43,6 +44,9 @@ public:
     int Append(const wxString& item, wxClientData *clientData)
         { int n = DoAppend(item); SetClientObject(n, clientData); return n; }
 
     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
     // --------------
 
     // deleting items
     // --------------
 


@@ -86,10 +90,6 @@ public:
     int Number() const { return GetCount(); }
 #endif // WXWIN_COMPATIBILITY_2_2
 
     int Number() const { return GetCount(); }
 #endif // WXWIN_COMPATIBILITY_2_2
 

-#ifdef __DARWIN__
-    virtual ~wxItemContainer() { }
-#endif
-

 protected:
     virtual int DoAppend(const wxString& item) = 0;
 
 protected:
     virtual int DoAppend(const wxString& item) = 0;