X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/treectrl.cpp?ds=sidebyside diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp index f95caad05b..4b1c943dba 100644 --- a/src/os2/treectrl.cpp +++ b/src/os2/treectrl.cpp @@ -31,13 +31,13 @@ #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/log.h" + #include "wx/app.h" + #include "wx/settings.h" #endif #include "wx/os2/private.h" -#include "wx/app.h" #include "wx/imaglist.h" -#include "wx/settings.h" // a macro to hide the ugliness of nested casts #define HITEM(item) (HTREEITEM)(WXHTREEITEM)(item) @@ -545,30 +545,6 @@ wxImageList* wxTreeCtrl::GetImageList () const return m_pImageListNormal; } // end of wxTreeCtrl::GetImageList -#if WXWIN_COMPATIBILITY_2_4 - -wxImageList* wxTreeCtrl::GetImageList(int nVal) const -{ - return GetImageList(); -} - -void wxTreeCtrl::SetImageList(wxImageList* pImageList, int nVal) -{ - SetImageList(pImageList); -} - -int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& rItem) const -{ - return GetItemImage(rItem, wxTreeItemIcon_Selected); -} - -void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& rItem, int nImage) -{ - SetItemImage(rItem, nImage, wxTreeItemIcon_Selected); -} - -#endif // WXWIN_COMPATIBILITY_2_4 - wxImageList* wxTreeCtrl::GetStateImageList () const { return m_pImageListNormal; @@ -1093,7 +1069,7 @@ bool wxTreeCtrl::IsVisible ( vWxRectContainer.SetTop(vRectContainer.yTop); vWxRectContainer.SetRight(vRectContainer.xRight); vWxRectContainer.SetBottom(vRectContainer.yBottom); - return (vWxRectContainer.Inside(wxPoint(vWxRectRecord.x, vWxRectRecord.y))); + return (vWxRectContainer.Contains(wxPoint(vWxRectRecord.x, vWxRectRecord.y))); } // end of wxTreeCtrl::IsVisible bool wxTreeCtrl::ItemHasChildren ( @@ -1503,28 +1479,6 @@ wxTreeItemId wxTreeCtrl::DoInsertItem ( return wxTreeItemId((long)pRecord->m_ulItemId); } -#if WXWIN_COMPATIBILITY_2_4 - -// for compatibility only -wxTreeItemId wxTreeCtrl::InsertItem ( - const wxTreeItemId& rParent -, const wxString& rsText -, int nImage -, int nSelImage -, long lInsertAfter -) -{ - return DoInsertItem( rParent - ,wxTreeItemId(lInsertAfter) - ,rsText - ,nImage - ,nSelImage - ,NULL - ); -} // end of wxTreeCtrl::InsertItem - -#endif // WXWIN_COMPATIBILITY_2_4 - wxTreeItemId wxTreeCtrl::AddRoot ( const wxString& rsText , int nImage @@ -1765,20 +1719,6 @@ void wxTreeCtrl::Toggle ( ); } // end of wxTreeCtrl::Toggle -#if WXWIN_COMPATIBILITY_2_4 - -void wxTreeCtrl::ExpandItem ( - const wxTreeItemId& rItem -, int nAction -) -{ - DoExpand( rItem - ,nAction - ); -} // end of wxTreeCtrl::ExpandItem - -#endif // WXWIN_COMPATIBILITY_2_4 - void wxTreeCtrl::Unselect () { wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),