extracted Unix code in a separate new file (src/unix/dlunix.cpp), it remains only...

[wxWidgets.git] / src / common / ctrlsub.cpp

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index c4debc5e7ccf175125135b441117455b338527f1..cf913548e08ba71cc9b73aa6aa125d357e671d6c 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -39,11 +39,6 @@
 // implementation
 // ============================================================================
 
-wxItemContainer::wxItemContainer()
-{
-    m_clientDataItemsType = wxClientData_None;
-}
-
 wxItemContainer::~wxItemContainer()
 {
     // this destructor is required for Darwin
@@ -156,13 +151,18 @@ void *wxItemContainer::GetClientData(int n) const
     return DoGetItemClientData(n);
 }
 
-wxControlWithItems::wxControlWithItems()
+wxControlWithItems::~wxControlWithItems()
 {
+    // this destructor is required for Darwin
 }
 
-wxControlWithItems::~wxControlWithItems()
+#if WXWIN_COMPATIBILITY_2_2
+
+int wxItemContainer::Number() const
 {
-    // this destructor is required for Darwin
+    return GetCount();
 }
 
+#endif // WXWIN_COMPATIBILITY_2_2
+
 #endif // wxUSE_CONTROLS