Use wxClientDataDictionary for client data.

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

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 662a953a6fc81a339ad019770ef43929847bcf60..3624531b20be1eb48165c59635ebcddd55b09512 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -16,7 +16,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "listboxbase.h"
 #endif
 
@@ -45,9 +45,7 @@ class WXDLLEXPORT wxListBoxBase : public wxControlWithItems
 public:
     // all generic methods are in wxControlWithItems, except for the following
     // ones which are not yet implemented by wxChoice/wxCombobox
-#ifdef __DARWIN__
-    virtual ~wxListBoxBase() { }
-#endif
+    virtual ~wxListBoxBase();
 
     void Insert(const wxString& item, int pos)
         { DoInsert(item, pos); }
@@ -133,8 +131,6 @@ protected:
     #include "wx/motif/listbox.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/listbox.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/listbox.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/listbox.h"
 #elif defined(__WXPM__)