HitTest is not deprecated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index c3bab9220b3a9ba96059132c984371258fe37377..d61560bdb4ea9bb0fe382c0119fd55713123e44c 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -103,13 +103,13 @@ public:
     // event.GetExtraLong())
     void Command(wxCommandEvent& event);
 
     // 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 );
 #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:
 #endif // WXWIN_COMPATIBILITY_2_6
 
 protected:


@@ -136,7 +136,6 @@ protected:
 
 #if WXWIN_COMPATIBILITY_2_6
     inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); }
 
 #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
 
 // ----------------------------------------------------------------------------
 #endif // WXWIN_COMPATIBILITY_2_6
 
 // ----------------------------------------------------------------------------