X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eddec696f06d65a80e7339b2fae14fcb55f8383..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/os2/treectrl.cpp diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp index 42ec46e572..9bddf9c719 100644 --- a/src/os2/treectrl.cpp +++ b/src/os2/treectrl.cpp @@ -80,11 +80,7 @@ public: wxTreeItemInternalData() {} ~wxTreeItemInternalData() { - if(m_pAttr) - { - delete m_pAttr; - m_pAttr = NULL; - } + wxDELETE(m_pAttr); } wxTreeItemAttr* m_pAttr; @@ -182,7 +178,7 @@ private: ); const wxTreeCtrl* m_pTree; - DECLARE_NO_COPY_CLASS(wxTreeTraversal) + wxDECLARE_NO_COPY_CLASS(wxTreeTraversal); }; // end of CLASS wxTreeTraversal // @@ -258,8 +254,6 @@ private: // wxWin macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -545,30 +539,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 +1063,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 +1473,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 @@ -1637,7 +1585,7 @@ void wxTreeCtrl::Delete ( delete (wxTreeItemAttr *)m_vAttrs.Delete((long)rItem.m_pItem); } vEvent.SetEventType(vEventType); - GetEventHandler()->ProcessEvent(vEvent); + HandleWindowEvent(vEvent); } // end of wxTreeCtrl::Delete // delete all children (but don't delete the item itself) @@ -1765,20 +1713,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), @@ -2118,7 +2052,7 @@ MRESULT wxTreeCtrl::OS2WindowProc ( break; } vEvent.SetEventType(vEventType); - bProcessed = GetEventHandler()->ProcessEvent(vEvent); + bProcessed = HandleWindowEvent(vEvent); break; } if (!bProcessed)