X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40ff126ac4ff57ab4aa22a5c7c7ce621479e8739..d31a4a84fb81e0f4975690e45d4d3b11a0f3cd5d:/include/wx/listbox.h

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index c3bab9220b..89a61df202 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -23,8 +23,8 @@
 #include "wx/ctrlsub.h"         // base class
 
 // forward declarations are enough here
-class WXDLLIMPEXP_BASE wxArrayInt;
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayInt;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 // ----------------------------------------------------------------------------
 // global data
@@ -42,15 +42,6 @@ public:
     wxListBoxBase() { }
     virtual ~wxListBoxBase();
 
-    // all generic methods are in wxControlWithItems, except for the following
-    // ones which are not yet implemented by wxChoice/wxComboBox
-    void Insert(const wxString& item, unsigned int pos)
-        { DoInsert(item, pos); }
-    void Insert(const wxString& item, unsigned int pos, void *clientData)
-        { DoInsert(item, pos); SetClientData(pos, clientData); }
-    void Insert(const wxString& item, unsigned int pos, wxClientData *clientData)
-        { DoInsert(item, pos); SetClientObject(pos, clientData); }
-
     void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos);
     void InsertItems(const wxArrayString& items, unsigned int pos)
         { DoInsertItems(items, pos); }
@@ -103,13 +94,13 @@ public:
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 
+    // returns the item number at a point or wxNOT_FOUND
+    int HitTest(const wxPoint& point) const { return DoListHitTest(point); }
+
 #if WXWIN_COMPATIBILITY_2_6
     // compatibility - these functions are deprecated, use the new ones
     // instead
     wxDEPRECATED( bool Selected(int n) const );
-
-    // returns the item number at a point or wxNOT_FOUND
-    wxDEPRECATED( int HitTest(const wxPoint& point) const );
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
@@ -136,7 +127,6 @@ protected:
 
 #if WXWIN_COMPATIBILITY_2_6
     inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); }
-    inline int wxListBoxBase::HitTest(const wxPoint& point) const { return DoListHitTest(point); }
 #endif // WXWIN_COMPATIBILITY_2_6
 
 // ----------------------------------------------------------------------------