X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/treectrl.cpp?ds=sidebyside diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp index 8b4154d1f8..4b1c943dba 100644 --- a/src/os2/treectrl.cpp +++ b/src/os2/treectrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/msw/treectrl.cpp +// Name: src/os2/treectrl.cpp // Purpose: wxTreeCtrl // Author: Julian Smart // Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98 @@ -26,14 +26,18 @@ #if wxUSE_TREECTRL +#include "wx/treectrl.h" + +#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/log.h" -#include "wx/dynarray.h" #include "wx/imaglist.h" -#include "wx/settings.h" -#include "wx/os2/treectrl.h" // a macro to hide the ugliness of nested casts #define HITEM(item) (HTREEITEM)(WXHTREEITEM)(item) @@ -492,16 +496,17 @@ void wxTreeCtrl::DoSetItem ( } } // end of wxTreeCtrl::DoSetItem -size_t wxTreeCtrl::GetCount () const +unsigned int wxTreeCtrl::GetCount () const { - CNRINFO vCnrInfo; + CNRINFO vCnrInfo; ::WinSendMsg( GetHWND() ,CM_QUERYCNRINFO ,MPFROMP(&vCnrInfo) ,(MPARAM)(USHORT)sizeof(CNRINFO) ); - return (size_t)vCnrInfo.cRecords; + + return (unsigned int)vCnrInfo.cRecords; } // end of wxTreeCtrl::GetCount unsigned int wxTreeCtrl::GetIndent () const @@ -540,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; @@ -1088,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 ( @@ -1498,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 @@ -1760,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), @@ -2124,13 +2069,4 @@ MRESULT wxTreeCtrl::OS2WindowProc ( return mRc; } // end of wxTreeCtrl::OS2WindowProc -#if WXWIN_COMPATIBILITY_2_2 - -wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const -{ - return GetItemParent( item ); -} - -#endif // WXWIN_COMPATIBILITY_2_2 - #endif // wxUSE_TREECTRL