Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index b3476b77a969b078578da7d6e5f8809b7ad95532..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
     // --------------
 


@@ -80,15 +84,11 @@ public:
     bool HasClientUntypedData() const
         { return m_clientDataItemsType == wxClientData_Void; }
 
     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(); }
     // 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;
 
 protected:
     virtual int DoAppend(const wxString& item) = 0;