solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove useless wxTreeCtrl::m_hasAnyAttr

Browse source 
We can simply check if m_attrs is empty instead.

This was added back in 696e1ea0b7 (in the
last millennium) and apparently there was no simple way to check if
wxHashTable used for m_attrs back then was empty, but it's trivial to do
it with std::unordered_map<>.
This commit is contained in:
Vadim Zeitlin 2023-04-17 22:33:51 +01:00
parent ef4f861ed7
commit 97c3d00b19
2 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/wx/msw/treectrl.h
View file

@ -310,9 +310,6 @@ private:
// the hash storing the items attributes (indexed by item ids)
std::unordered_map<void*, std::unique_ptr<wxItemAttr>> m_attrs;
// true if the hash above is not empty
bool m_hasAnyAttr;
#if wxUSE_DRAGIMAGE
// used for dragging
wxDragImage *m_dragImage;

24
src/msw/treectrl.cpp
View file

@ -732,7 +732,6 @@ wxTreeCtrl::wxTreeCtrl(wxWindow *parent,
void wxTreeCtrl::Init()
{
m_textCtrl = nullptr;
m_hasAnyAttr = false;
#if wxUSE_DRAGIMAGE
m_dragImage = nullptr;
#endif
@ -853,14 +852,10 @@ wxTreeCtrl::~wxTreeCtrl()
{
m_isBeingDeleted = true;
// delete any attributes
if ( m_hasAnyAttr )
{
m_attrs.clear();
// prevent TVN_DELETEITEM handler from deleting the attributes again!
m_hasAnyAttr = false;
}
// delete any attributes: it's important to do it explicitly before calling
// DeleteAllItems() to prevent TVN_DELETEITEM handler from deleting the
// attributes again!
m_attrs.clear();
DeleteTextCtrl();
@ -1207,8 +1202,6 @@ wxItemAttr* wxTreeCtrl::DoGetAttrPtr(const wxTreeItemId& item)
const auto it = m_attrs.find(item.m_pItem);
if ( it == m_attrs.end() )
{
m_hasAnyAttr = true;
attr = new wxItemAttr;
m_attrs[item.m_pItem] = std::unique_ptr<wxItemAttr>(attr);
}
@ -3335,10 +3328,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
event.m_item = tv->itemOld.hItem;
if ( m_hasAnyAttr )
{
m_attrs.erase(tv->itemOld.hItem);
}
m_attrs.erase(tv->itemOld.hItem);
}
break;
@ -3530,8 +3520,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
case CDDS_PREPAINT:
// if we've got any items with non standard attributes,
// notify us before painting each item
*result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
: CDRF_DODEFAULT;
*result = m_attrs.empty() ? CDRF_DODEFAULT
: CDRF_NOTIFYITEMDRAW;
// windows in TreeCtrl use one-based index for item state images,
// 0 indexed image is not being used, we're using zero-based index,