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

Use vector in wxMSW wxAcceleratorTable code

Browse source 
No real changes, just replace manually-allocated buffer with a vector.
This commit is contained in:
Vadim Zeitlin 2023-05-15 23:59:14 +01:00
parent d12c3d0805
commit 4cc13e1099
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/msw/accel.cpp
View file

@ -31,6 +31,8 @@
#include "wx/msw/private.h"
#include "wx/msw/private/keyboard.h"
#include <vector>
wxIMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject);
// ----------------------------------------------------------------------------
@ -95,7 +97,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
{
m_refData = new wxAcceleratorRefData;
ACCEL* arr = new ACCEL[n];
std::vector<ACCEL> arr(n);
for ( int i = 0; i < n; i++ )
{
int flags = entries[i].GetFlags();
@ -115,8 +117,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
arr[i].cmd = (WORD)entries[i].GetCommand();
}
M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(arr, n);
delete[] arr;
M_ACCELDATA->m_hAccel = ::CreateAcceleratorTable(&arr[0], n);
M_ACCELDATA->m_ok = (M_ACCELDATA->m_hAccel != 0);
}