Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h
index b3476b77a969b078578da7d6e5f8809b7ad95532..0fa00d4e64e7483906165a72020e70ce7b898a94 100644 (file)
--- a/include/wx/ctrlsub.h
+++ b/include/wx/ctrlsub.h
@@ -80,14 +80,14 @@ 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
+#endif // WXWIN_COMPATIBILITY_2_2

 
 

-#ifdef __WXMAC_X__
-    virtual ~wxItemContainer() {}  // Added min for Mac X
+#ifdef __DARWIN__
+    virtual ~wxItemContainer() { }

 #endif
 
 protected:
 #endif
 
 protected: