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

Stop allocating wxLV_ITEM::m_buf on the heap

Browse source 
There is no need to do it when we can just use the object.
This commit is contained in:
Vadim Zeitlin 2022-10-27 02:47:07 +01:00
parent 4519d8e08a
commit df80d40349
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/msw/listctrl.cpp
View file

@ -129,7 +129,7 @@ class wxLV_ITEM
{
public:
// default ctor, use Init() later
wxLV_ITEM() { m_buf = nullptr; m_pItem = nullptr; }
wxLV_ITEM() { m_pItem = nullptr; }
// init without conversion
void Init(LV_ITEMW& item)
@ -154,27 +154,25 @@ public:
// convert text from ANSI to Unicod if necessary
if ( (item.mask & LVIF_TEXT) && item.pszText )
{
m_buf = new wxWCharBuffer(wxConvLocal.cMB2WC(item.pszText));
m_item.pszText = (wxChar *)m_buf->data();
m_buf = wxConvLocal.cMB2WC(item.pszText);
m_item.pszText = m_buf.data();
}
}
// ctor without conversion
wxLV_ITEM(LV_ITEMW& item) : m_buf(nullptr), m_pItem(&item) { }
wxLV_ITEM(LV_ITEMW& item) : m_pItem(&item) { }
// ctor with conversion
wxLV_ITEM(LV_ITEMA& item) : m_buf(nullptr)
wxLV_ITEM(LV_ITEMA& item)
{
Init(item);
}
~wxLV_ITEM() { delete m_buf; }
// conversion to the real LV_ITEM
operator LV_ITEMW&() const { return *m_pItem; }
private:
wxWCharBuffer *m_buf;
wxWCharBuffer m_buf;
LV_ITEMW *m_pItem;
LV_ITEMW m_item;