X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1729813a8d1b0769eee47fcda2b3b03b4f36e893..b64e7047020ed19c55fb0179e849554d138d8b06:/src/os2/treectrl.cpp?ds=sidebyside diff --git a/src/os2/treectrl.cpp b/src/os2/treectrl.cpp index ba09050661..9ee999969a 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 @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "treectrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,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) @@ -210,7 +210,7 @@ public: { return true; } - PMYRECORD pRecord = FindOS2TreeRecordByID( GetTree()->GetHWND() + PMYRECORD pRecord = FindOS2TreeRecordByID( (HWND)GetTree()->GetHWND() ,rItem.m_pItem ); if (pRecord->m_vRecord.flRecordAttr & CRA_SELECTED) @@ -346,9 +346,9 @@ void wxTreeCtrl::Init () { m_pImageListNormal = NULL; m_pImageListState = NULL; - m_bOwnsImageListNormal = FALSE; - m_bOwnsImageListState = FALSE; - m_bHasAnyAttr = FALSE; + m_bOwnsImageListNormal = false; + m_bOwnsImageListState = false; + m_bHasAnyAttr = false; m_pDragImage = NULL; // @@ -440,7 +440,7 @@ wxTreeCtrl::~wxTreeCtrl () { delete (wxTreeItemAttr *)pNode->Data(); } - m_bHasAnyAttr = FALSE; + m_bHasAnyAttr = false; } DeleteTextCtrl(); @@ -496,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 @@ -544,6 +545,30 @@ 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; @@ -553,7 +578,7 @@ wxImageList* wxTreeCtrl::GetStateImageList () const // The SETS of imagelists really do nothing under OS2 as a RECORDCORE // struct has the icon imbedded in it that it uses for the icon being // displayed via the TREEITEMDESC member. Provided for interface -// compatability only +// compatibility only // void wxTreeCtrl::SetAnyImageList ( wxImageList* WXUNUSED(pImageList) @@ -568,7 +593,7 @@ void wxTreeCtrl::SetImageList ( { if (m_bOwnsImageListNormal) delete m_pImageListNormal; - m_bOwnsImageListNormal = FALSE; + m_bOwnsImageListNormal = false; } // end of wxTreeCtrl::SetImageList void wxTreeCtrl::SetStateImageList ( @@ -577,21 +602,21 @@ void wxTreeCtrl::SetStateImageList ( { if (m_bOwnsImageListState) delete m_pImageListState; - m_bOwnsImageListState = FALSE; + m_bOwnsImageListState = false; } // end of wxTreeCtrl::SetStateImageList void wxTreeCtrl::AssignImageList ( wxImageList* WXUNUSED(pImageList) ) { - m_bOwnsImageListNormal = TRUE; + m_bOwnsImageListNormal = true; } // end of wxTreeCtrl::AssignImageList void wxTreeCtrl::AssignStateImageList ( wxImageList* WXUNUSED(pImageList) ) { - m_bOwnsImageListState = TRUE; + m_bOwnsImageListState = true; } // end of wxTreeCtrl::AssignStateImageList size_t wxTreeCtrl::GetChildrenCount ( @@ -974,7 +999,7 @@ void wxTreeCtrl::SetItemTextColour ( , const wxColour& rCol ) { - m_bHasAnyAttr = TRUE; + m_bHasAnyAttr = true; long lId = (long)rItem.m_pItem; wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); @@ -993,7 +1018,7 @@ void wxTreeCtrl::SetItemBackgroundColour ( , const wxColour& rCol ) { - m_bHasAnyAttr = TRUE; + m_bHasAnyAttr = true; long lId = (long)rItem.m_pItem; wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); @@ -1012,7 +1037,7 @@ void wxTreeCtrl::SetItemFont ( , const wxFont& rFont ) { - m_bHasAnyAttr = TRUE; + m_bHasAnyAttr = true; long lId = (long)rItem.m_pItem; wxTreeItemAttr* pAttr = (wxTreeItemAttr *)m_vAttrs.Get(lId); @@ -1068,7 +1093,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 ( @@ -1478,6 +1503,8 @@ wxTreeItemId wxTreeCtrl::DoInsertItem ( return wxTreeItemId((long)pRecord->m_ulItemId); } +#if WXWIN_COMPATIBILITY_2_4 + // for compatibility only wxTreeItemId wxTreeCtrl::InsertItem ( const wxTreeItemId& rParent @@ -1496,6 +1523,8 @@ wxTreeItemId wxTreeCtrl::InsertItem ( ); } // end of wxTreeCtrl::InsertItem +#endif // WXWIN_COMPATIBILITY_2_4 + wxTreeItemId wxTreeCtrl::AddRoot ( const wxString& rsText , int nImage @@ -1736,6 +1765,8 @@ void wxTreeCtrl::Toggle ( ); } // end of wxTreeCtrl::Toggle +#if WXWIN_COMPATIBILITY_2_4 + void wxTreeCtrl::ExpandItem ( const wxTreeItemId& rItem , int nAction @@ -1746,6 +1777,8 @@ void wxTreeCtrl::ExpandItem ( ); } // end of wxTreeCtrl::ExpandItem +#endif // WXWIN_COMPATIBILITY_2_4 + void wxTreeCtrl::Unselect () { wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), @@ -1767,7 +1800,7 @@ void wxTreeCtrl::UnselectAll () for (size_t n = 0; n < nCount; n++) { SetItemCheck( aSelections[n] - ,FALSE + ,false ); } } @@ -2051,7 +2084,7 @@ MRESULT wxTreeCtrl::OS2WindowProc ( vEventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT; vEvent.m_item = pRecord->m_ulItemId; vEvent.m_label = pRecord->m_vRecord.pszTree; - vEvent.m_editCancelled = FALSE; + vEvent.m_editCancelled = false; } break; @@ -2066,11 +2099,11 @@ MRESULT wxTreeCtrl::OS2WindowProc ( vEvent.m_label = pRecord->m_vRecord.pszTree; if (pRecord->m_vRecord.pszTree == NULL) { - vEvent.m_editCancelled = TRUE; + vEvent.m_editCancelled = true; } else { - vEvent.m_editCancelled = FALSE; + vEvent.m_editCancelled = false; } } break; @@ -2096,13 +2129,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